diff --git a/main/announcements/announcements.php b/main/announcements/announcements.php
index 48111c5323..4224a6153f 100755
--- a/main/announcements/announcements.php
+++ b/main/announcements/announcements.php
@@ -217,7 +217,7 @@ switch ($action) {
             $form_name = get_lang('ModifyAnnouncement');
         }
         $form->addElement('header', $form_name);
-
+        $to = [];
         if (empty($group_id)) {
             if (isset($_GET['remind_inactive'])) {
                 $email_ann = '1';
@@ -311,6 +311,9 @@ switch ($action) {
             );
         } else {
             $defaults = array();
+            if (!empty($to)) {
+                $defaults['users'] = $to;
+            }
         }
 
         $form->addElement('text', 'title', get_lang('EmailTitle'));
diff --git a/main/inc/lib/course.lib.php b/main/inc/lib/course.lib.php
index 4d0f7a6a0f..c1cc505cb6 100755
--- a/main/inc/lib/course.lib.php
+++ b/main/inc/lib/course.lib.php
@@ -5331,7 +5331,7 @@ class CourseManager
      * @param FormValidator $form
      * @param array $to_already_selected
      *
-     * @param HTML_QuickForm_element
+     * @return HTML_QuickForm_element
      */
     public static function addUserGroupMultiSelect(&$form, $to_already_selected)
     {
@@ -5399,7 +5399,6 @@ class CourseManager
     public static function addGroupMultiSelect($form, $group_id, $to = array())
     {
         $group_users = GroupManager::get_subscribed_users($group_id);
-
         $array = self::buildSelectOptions(null, $group_users, $to);
 
         $result = array();
diff --git a/main/inc/lib/tracking.lib.php b/main/inc/lib/tracking.lib.php
index e10b653dfb..e7a7b066d7 100755
--- a/main/inc/lib/tracking.lib.php
+++ b/main/inc/lib/tracking.lib.php
@@ -3712,10 +3712,13 @@ class Tracking
                     AND session_course_user.session_id = '.intval($session_id).'
                     AND session_course_user.user_id = stats_login.user_id ';
         }
-        $sql = 'SELECT user_id, MAX(login_course_date) max_date
+
+        $sql = 'SELECT stats_login.user_id, MAX(login_course_date) max_date
                 FROM '.$tbl_track_login.' stats_login '.$inner.'
                 INNER JOIN '.$tableCourse.' c
                 ON (c.id = stats_login.c_id)
+                INNER JOIN '.$table_course_rel_user.' course_user
+                ON course_user.user_id = stats_login.user_id AND course_user.c_id = c.id
                 GROUP BY user_id
                 HAVING DATE_SUB( "' . $now . '", INTERVAL '.$since.' DAY) > max_date ';