diff --git a/index.php b/index.php
index 1ab86c2214d..ede2d13e310 100644
--- a/index.php
+++ b/index.php
@@ -151,7 +151,7 @@
         case FRONTPAGECOURSELIST:
         case FRONTPAGECATEGORYNAMES:
 
-            if (isset($USER->id) and !isset($USER->admin)) {
+            if (isloggedin() && !isset($USER->admin) && empty($CFG->disablemycourses)) {
                 print_heading_block(get_string('mycourses'));
                 print_my_moodle();
             } else {