diff --git a/main/dropbox/dropbox_functions.inc.php b/main/dropbox/dropbox_functions.inc.php
index 4c1ec33e91..8b98efeab2 100644
--- a/main/dropbox/dropbox_functions.inc.php
+++ b/main/dropbox/dropbox_functions.inc.php
@@ -514,13 +514,13 @@ function display_add_form() {
 	if (api_get_session_id()) {	    
 		$complete_user_list_for_dropbox = array();
 		if (api_get_setting('dropbox_allow_student_to_student')=='true' || $_user['status'] != STUDENT) {
-			$complete_user_list_for_dropbox = CourseManager :: get_user_list_from_course_code($course_info['code'], true, api_get_session_id());
+			$complete_user_list_for_dropbox = CourseManager :: get_user_list_from_course_code($course_info['code'], api_get_session_id());
 		}
 		$complete_user_list2 = CourseManager::get_coach_list_from_course_code($course_info['code'], api_get_session_id());
 		$complete_user_list_for_dropbox = array_merge($complete_user_list_for_dropbox, $complete_user_list2);
 	} else {
 		if (api_get_setting('dropbox_allow_student_to_student') == 'true' || $_user['status'] != STUDENT) {		    
-			$complete_user_list_for_dropbox = CourseManager :: get_user_list_from_course_code($course_info['code'], false, api_get_session_id());
+			$complete_user_list_for_dropbox = CourseManager :: get_user_list_from_course_code($course_info['code'], api_get_session_id());
 		} else {
 			$complete_user_list_for_dropbox = CourseManager :: get_teacher_list_from_course_code($course_info['code'], false);
 		}
diff --git a/main/inc/lib/attendance.lib.php b/main/inc/lib/attendance.lib.php
index d1d41882ec..0415fc5cbc 100644
--- a/main/inc/lib/attendance.lib.php
+++ b/main/inc/lib/attendance.lib.php
@@ -406,9 +406,9 @@ class Attendance
 		$current_session_id = api_get_session_id();
 		$current_course_id  = api_get_course_id();
 		if (!empty($current_session_id)) {
-			$a_course_users = CourseManager :: get_user_list_from_course_code($current_course_id, true, $current_session_id,'','lastname');
+			$a_course_users = CourseManager :: get_user_list_from_course_code($current_course_id, $current_session_id,'','lastname');
 		} else {
-			$a_course_users = CourseManager :: get_user_list_from_course_code($current_course_id, false, 0, '','lastname');
+			$a_course_users = CourseManager :: get_user_list_from_course_code($current_course_id, 0, '','lastname');
 		}
 		// get registered users inside current course
 		$a_users = array();
diff --git a/main/inc/lib/course.lib.php b/main/inc/lib/course.lib.php
index dd6b195aea..1c6b0a0a0a 100644
--- a/main/inc/lib/course.lib.php
+++ b/main/inc/lib/course.lib.php
@@ -1126,7 +1126,7 @@ class CourseManager {
      * @param string $order_by the field to order the users by. Valid values are 'lastname', 'firstname', 'username', 'email', 'official_code' OR a part of a SQL statement that starts with ORDER BY ...
      *  @return array
      */
-    public static function get_user_list_from_course_code($course_code, $with_session = true, $session_id = 0, $limit = '', $order_by = '') {        
+    public static function get_user_list_from_course_code($course_code, $session_id = 0, $limit = '', $order_by = '') {        
         // variable initialisation
         $session_id 	= intval($session_id);        
         $course_code 	= Database::escape_string($course_code);
@@ -1381,7 +1381,7 @@ class CourseManager {
         $virtual_course_list = self::get_virtual_courses_linked_to_real_course($course_code);
 
         //get users from real course
-        $user_list = self::get_user_list_from_course_code($course_code, $with_sessions, $session_id);
+        $user_list = self::get_user_list_from_course_code($course_code, $session_id);
         foreach ($user_list as $this_user) {
             $complete_user_list[] = $this_user;
         }
@@ -1389,7 +1389,7 @@ class CourseManager {
         //get users from linked courses
         foreach ($virtual_course_list as $this_course) {
             $course_code = $this_course['code'];
-            $user_list = self::get_user_list_from_course_code($course_code, $with_sessions, $session_id);
+            $user_list = self::get_user_list_from_course_code($course_code, $session_id);
             foreach ($user_list as $this_user) {
                 $complete_user_list[] = $this_user;
             }
diff --git a/main/survey/survey_invite.php b/main/survey/survey_invite.php
index f84cdb40b3..76d3e30262 100644
--- a/main/survey/survey_invite.php
+++ b/main/survey/survey_invite.php
@@ -93,7 +93,7 @@ $form = new FormValidator('publish_form', 'post', api_get_self().'?survey_id='.$
 $form->addElement('header', '', $tool_name);
 
 // Course users
-$complete_user_list = CourseManager :: get_user_list_from_course_code($_course['id'], true, $_SESSION['id_session'], '', api_sort_by_first_name() ? 'ORDER BY firstname' : 'ORDER BY lastname');
+$complete_user_list = CourseManager :: get_user_list_from_course_code($_course['id'], $_SESSION['id_session'], '', api_sort_by_first_name() ? 'ORDER BY firstname' : 'ORDER BY lastname');
 $possible_users = array();
 foreach ($complete_user_list as $index => & $user) {
 	$possible_users[$user['user_id']] = api_get_person_name($user['firstname'], $user['lastname']);
diff --git a/main/user/subscribe_user.php b/main/user/subscribe_user.php
index e51c1a4c0d..18b39be938 100644
--- a/main/user/subscribe_user.php
+++ b/main/user/subscribe_user.php
@@ -340,9 +340,9 @@ function get_number_of_users() {
 
 		// getting all the users of the course (to make sure that we do not display users that are already in the course)
 		if (!empty($_SESSION["id_session"])) {
-			$a_course_users = CourseManager :: get_user_list_from_course_code($_SESSION['_course']['id'], true, $_SESSION['id_session']);
+			$a_course_users = CourseManager :: get_user_list_from_course_code($_SESSION['_course']['id'], $_SESSION['id_session']);
 		} else {
-			$a_course_users = CourseManager :: get_user_list_from_course_code($_SESSION['_course']['id'], true);
+			$a_course_users = CourseManager :: get_user_list_from_course_code($_SESSION['_course']['id'], 0);
 	    }
 		foreach ($a_course_users as $user_id=>$course_user) {
 			$users_of_course[] = $course_user['user_id'];
@@ -590,9 +590,9 @@ function get_user_data($from, $number_of_items, $column, $direction) {
 
 		// getting all the users of the course (to make sure that we do not display users that are already in the course)
 		if (!empty($_SESSION["id_session"])) {
-			$a_course_users = CourseManager :: get_user_list_from_course_code($_SESSION['_course']['id'], true, $_SESSION['id_session']);
+			$a_course_users = CourseManager :: get_user_list_from_course_code($_SESSION['_course']['id'], $_SESSION['id_session']);
 		} else {
-			$a_course_users = CourseManager :: get_user_list_from_course_code($_SESSION['_course']['id'], true);
+			$a_course_users = CourseManager :: get_user_list_from_course_code($_SESSION['_course']['id'], 0);
 	    }
 		foreach ($a_course_users as $user_id=>$course_user) {
 			$users_of_course[] = $course_user['user_id'];
diff --git a/main/user/user.php b/main/user/user.php
index 30d28fba34..ecb4822763 100644
--- a/main/user/user.php
+++ b/main/user/user.php
@@ -454,10 +454,10 @@ if (CourseManager::has_virtual_courses_from_code($course_id, $user_id)) {
 function get_number_of_users() {
 	$counter = 0;
 	if (!empty($_SESSION["id_session"])){
-		$a_course_users = CourseManager :: get_user_list_from_course_code($_SESSION['_course']['id'], true, $_SESSION['id_session']);
+		$a_course_users = CourseManager :: get_user_list_from_course_code($_SESSION['_course']['id'], $_SESSION['id_session']);
 
 	} else {
-		$a_course_users = CourseManager :: get_user_list_from_course_code($_SESSION['_course']['id'], false);
+		$a_course_users = CourseManager :: get_user_list_from_course_code($_SESSION['_course']['id'], 0);
 	}
 	foreach ($a_course_users as $user_id => $o_course_user) {
 		if ((isset($_GET['keyword']) && search_keyword($o_course_user['firstname'], $o_course_user['lastname'], $o_course_user['username'], $o_course_user['official_code'], $_GET['keyword'])) || !isset($_GET['keyword']) || empty($_GET['keyword'])) {
@@ -529,9 +529,9 @@ function get_user_data($from, $number_of_items, $column, $direction) {
 	}
 
 	if (!empty($_SESSION["id_session"])) {
-		$a_course_users = CourseManager :: get_user_list_from_course_code($_SESSION['_course']['id'], true, $_SESSION['id_session'], $limit, $order_by);
+		$a_course_users = CourseManager :: get_user_list_from_course_code($_SESSION['_course']['id'], $_SESSION['id_session'], $limit, $order_by);
 	} else {
-		$a_course_users = CourseManager :: get_user_list_from_course_code($_SESSION['_course']['id'], false, 0, $limit, $order_by);
+		$a_course_users = CourseManager :: get_user_list_from_course_code($_SESSION['_course']['id'], 0, $limit, $order_by);
 	}
 
 	foreach ($a_course_users as $user_id => $o_course_user) {
diff --git a/main/webservices/cm_webservice_course.php b/main/webservices/cm_webservice_course.php
index cee8472817..d58c8eefef 100644
--- a/main/webservices/cm_webservice_course.php
+++ b/main/webservices/cm_webservice_course.php
@@ -320,7 +320,7 @@ class WSCMCourse extends WSCM {
 				}
 
 				// Determining number of students registered in course
-				$user_list = CourseManager::get_user_list_from_course_code($course['code'], false);
+				$user_list = CourseManager::get_user_list_from_course_code($course['code']);
 				$course_tmp['number_students'] = count($user_list);
 
 				// Determining external course id
diff --git a/main/webservices/webservice_course.php b/main/webservices/webservice_course.php
index 606989807d..9824fad57a 100644
--- a/main/webservices/webservice_course.php
+++ b/main/webservices/webservice_course.php
@@ -330,7 +330,7 @@ class WSCourse extends WS {
 				}
 
 				// Determining number of students registered in course
-				$user_list = CourseManager::get_user_list_from_course_code($course['code'], false);
+				$user_list = CourseManager::get_user_list_from_course_code($course['code'], 0);
 				$course_tmp['number_students'] = count($user_list);
 
 				// Determining external course id - this code misses the external course id field name
diff --git a/main/wiki/wiki.inc.php b/main/wiki/wiki.inc.php
index 57c399481c..db1e8cdf60 100644
--- a/main/wiki/wiki.inc.php
+++ b/main/wiki/wiki.inc.php
@@ -1843,11 +1843,11 @@ function auto_add_page_users($assignment_type) {
       {
           //extract course members
         if(!empty($session_id)){
-            $a_users_to_add = CourseManager :: get_user_list_from_course_code($_SESSION['_course']['id'], true, $session_id);
+            $a_users_to_add = CourseManager :: get_user_list_from_course_code($_SESSION['_course']['id'], $session_id);
         }
         else
         {
-            $a_users_to_add = CourseManager :: get_user_list_from_course_code($_SESSION['_course']['id'], true);
+            $a_users_to_add = CourseManager :: get_user_list_from_course_code($_SESSION['_course']['id'], 0);
         }
     }
     else