diff --git a/main/inc/lib/course.lib.php b/main/inc/lib/course.lib.php
index 77d1d4dfb3..de14a0eb1d 100755
--- a/main/inc/lib/course.lib.php
+++ b/main/inc/lib/course.lib.php
@@ -3175,7 +3175,8 @@ class CourseManager
         $direction = null,
         $getCount = false,
         $keyword = null,
-        $sessionId = null
+        $sessionId = null,
+        $showAllAssignedCourses = false
     ) {
         // Database Table Definitions
         $tbl_course = Database::get_main_table(TABLE_MAIN_COURSE);
@@ -3192,10 +3193,10 @@ class CourseManager
         $whereConditions = null;
         switch ($status) {
             case COURSEMANAGER:
-                $whereConditions .= " AND
-                    cru.user_id = '$user_id' AND
-                    status = ".COURSEMANAGER."
-                ";
+                $whereConditions .= " AND cru.user_id = '$user_id'";
+                if (!$showAllAssignedCourses) {
+                    $whereConditions .= " AND status = ".COURSEMANAGER;
+                }
                 break;
             case DRH:
                 $whereConditions .= " AND
diff --git a/main/inc/lib/tracking.lib.php b/main/inc/lib/tracking.lib.php
index bfe2a1d9cc..1a58413f47 100755
--- a/main/inc/lib/tracking.lib.php
+++ b/main/inc/lib/tracking.lib.php
@@ -165,7 +165,15 @@ class Tracking
 
             $platformCourses = CourseManager::getCoursesFollowedByUser(
                 $userId,
-                COURSEMANAGER
+                COURSEMANAGER,
+                null,
+                null,
+                null,
+                null,
+                false,
+                null,
+                null,
+                true
             );
             foreach ($platformCourses as $course) {
                 $courses[$course['code']] = $course['code'];