diff --git a/main/inc/lib/tracking.lib.php b/main/inc/lib/tracking.lib.php
index 7ac177dfe7..3ee88a995a 100755
--- a/main/inc/lib/tracking.lib.php
+++ b/main/inc/lib/tracking.lib.php
@@ -6435,7 +6435,7 @@ class Tracking
 
         if ($displayExtraFields) {
             $extraField = new ExtraField('user');
-            $extraField->addElements($form, 0, [], true, false);
+            $extraField->addElements($form, 0, [], true, false, [], [], [], false, true);
         }
 
         $form->addButtonSearch(get_lang('Search'));
diff --git a/main/mySpace/student.php b/main/mySpace/student.php
index 0f9ea17dec..c19668e911 100755
--- a/main/mySpace/student.php
+++ b/main/mySpace/student.php
@@ -47,23 +47,9 @@ if (isset($_GET['user_id']) && '' != $_GET['user_id'] && isset($_GET['type']) &&
 
 function get_count_users()
 {
-    $sleepingDays = isset($_GET['sleeping_days']) ? (int) $_GET['sleeping_days'] : null;
-    $active = isset($_GET['active']) ? (int) $_GET['active'] : 1;
-    $keyword = isset($_GET['keyword']) ? Security::remove_XSS($_GET['keyword']) : null;
-
-    $lastConnectionDate = null;
-    if (!empty($sleepingDays)) {
-        $lastConnectionDate = api_get_utc_datetime(strtotime($sleepingDays.' days ago'));
-    }
+    $users = get_users(null, null, 0, 3);
 
-    return SessionManager::getCountUserTracking(
-        $keyword,
-        $active,
-        $lastConnectionDate,
-        null,
-        null,
-        api_is_student_boss() ? null : STUDENT
-    );
+    return count($users);
 }
 
 function get_users($from, $limit, $column, $direction)
@@ -424,12 +410,11 @@ if ($export_csv) {
         $users = isset($_POST['uid']) ? $_POST['uid'] : '';
         if (!empty($subject) && !empty($message) && !empty($users)) {
             foreach ($users as $uid) {
-                $userInfo = api_get_user_info($uid);
-                MessageManager::sendMessageAboutUser(
-                    $userInfo,
-                    api_get_user_info(),
+                MessageManager::send_message_simple(
+                    $uid,
                     $subject,
-                    $message
+                    $message,
+                    api_get_user_id()
                 );
             }
             Display::addFlash(Display::return_message(get_lang('MessageSent')));