diff --git a/main/announcements/announcements.inc.php b/main/announcements/announcements.inc.php
index 495b652fda..bc166d9ab3 100755
--- a/main/announcements/announcements.inc.php
+++ b/main/announcements/announcements.inc.php
@@ -304,8 +304,14 @@ function get_course_users()
 {
 	//this would return only the users from real courses:
 	//$user_list = CourseManager::get_user_list_from_course_code(api_get_course_id());
+	$session_id = api_get_session_id();
+	
+	if ($session_id) {
+		$user_list = CourseManager::get_real_and_linked_user_list(api_get_course_id(), true, $session_id);
+	} else {
+		$user_list = CourseManager::get_real_and_linked_user_list(api_get_course_id(), false, 0);
+	}
 
-	$user_list = CourseManager::get_real_and_linked_user_list(api_get_course_id(), true, $_SESSION['id_session']);
 	return $user_list;
 }
 
@@ -314,8 +320,14 @@ function get_course_users()
 * not including linked courses
 */
 function get_course_groups()
-{
-	$new_group_list = CourseManager::get_group_list_of_course(api_get_course_id(), intval($_SESSION['id_session']));
+{	
+	$session_id = api_get_session_id();
+	
+	if ($session_id) {
+		$new_group_list = CourseManager::get_group_list_of_course(api_get_course_id(), intval($session_id));
+	} else {	
+		$new_group_list = CourseManager::get_group_list_of_course(api_get_course_id(), 0);
+	}
 	return $new_group_list;
 }
 
diff --git a/main/inc/lib/course.lib.php b/main/inc/lib/course.lib.php
index 24c94134f0..56d6f9da29 100644
--- a/main/inc/lib/course.lib.php
+++ b/main/inc/lib/course.lib.php
@@ -1186,13 +1186,12 @@ class CourseManager {
 		$database_name = $course_info['db_name'];
 
 		$group_list = array();
-		$session_condition = $session_id == 0 ? '' : ' WHERE g.session_id IN(0,'.intval($session_id).')';
 
 		$result = Database::query("SELECT g.id, g.name, COUNT(gu.id) userNb
 				FROM ".Database::get_course_table(TABLE_GROUP, $database_name)." AS g
 				LEFT JOIN ".Database::get_course_table(TABLE_GROUP_USER, $database_name)." gu
 				ON g.id = gu.group_id
-				$session_condition
+				WHERE g.session_id IN(0,".intval($session_id).")
 				GROUP BY g.id
 				ORDER BY g.name");