diff --git a/main/chat/chat_whoisonline.php b/main/chat/chat_whoisonline.php
index f7737fa11d..4a38a16046 100755
--- a/main/chat/chat_whoisonline.php
+++ b/main/chat/chat_whoisonline.php
@@ -16,14 +16,11 @@ $courseInfo = api_get_course_info();
 $group_id = api_get_group_id();
 $session_id = api_get_session_id();
 $user_id = api_get_user_id();
-$session_condition = api_get_session_condition($session_id);
 $group_condition = " AND to_group_id = '$group_id'";
 
 $extra_condition = '';
 if (!empty($group_id)) {
     $extra_condition = $group_condition;
-} else {
-    $extra_condition = $session_condition;
 }
 
 if (!empty($course)) {
@@ -42,7 +39,6 @@ if (!empty($course)) {
 
 	$isAllowed = !(empty($pseudo_user) || !$_cid);
 	$isMaster = api_is_course_admin();
-
     $date_inter = api_get_utc_datetime(time() - 120);
 
     $users = array();
@@ -70,6 +66,7 @@ if (!empty($course)) {
         $result = Database::query($sql);
         $users = Database::store_result($result);
 	} else {
+        $session_condition = api_get_session_condition($session_id, true, false, 't3.session_id');
 		// select learners
 		$query = "SELECT DISTINCT t1.user_id,username,firstname,lastname,picture_uri,email
                   FROM $tbl_user t1, $tbl_chat_connected t2, $tbl_session_course_user t3
@@ -77,8 +74,8 @@ if (!empty($course)) {
 		          t2.c_id = $course_id AND
 		          t1.user_id=t2.user_id AND t3.user_id=t2.user_id AND
 		          t3.session_id = '".$session_id."' AND
-		          t3.c_id = '".$_course['real_id']."' AND
-		          t2.last_connection>'".$date_inter."' $extra_condition
+		          t3.c_id = '".$courseInfo['real_id']."' AND
+		          t2.last_connection>'".$date_inter."' $session_condition
 		          ORDER BY username";
 		$result = Database::query($query);
 		while ($learner = Database::fetch_array($result)) {
@@ -129,33 +126,35 @@ if (!empty($course)) {
 		<div class="viewport"><div id="hidden" class="overview">
 		<ul class="profile list-group">
 			<?php
-				foreach ($users as & $user) {
-					if (empty($session_id)) {
-						$status = $user['status'];
-					} else {
-						$status = CourseManager::is_course_teacher($user['user_id'], $_SESSION['_course']['id']) ? 1 : 5;
-					}
-					$fileUrl = Usermanager::getUserPicture($user['user_id'], USER_IMAGE_SIZE_MEDIUM);
-				    $url_user_profile=api_get_path(WEB_CODE_PATH).'social/profile.php?u='.$user['user_id'].'&';
+            foreach ($users as & $user) {
+                if (empty($session_id)) {
+                    $status = $user['status'];
+                } else {
+                    $status = CourseManager::is_course_teacher($user['user_id'], $_SESSION['_course']['id']) ? 1 : 5;
+                }
+                $fileUrl = Usermanager::getUserPicture($user['user_id'], USER_IMAGE_SIZE_MEDIUM);
+                $url_user_profile=api_get_path(WEB_CODE_PATH).'social/profile.php?u='.$user['user_id'].'&';
 			?>
 			<li class="list-group-item">
 				<img src="<?php echo $fileUrl;?>" border="0" width="50" alt="" class="user-image-chat" />
 				<div class="user-name">
-					<a href="<?php echo $url_user_profile; ?>" target="_blank"><?php echo api_get_person_name($user['firstname'], $user['lastname']); ?></a>
+					<a href="<?php echo $url_user_profile; ?>" target="_blank">
+                        <?php echo api_get_person_name($user['firstname'], $user['lastname']); ?>
+                    </a>
 					<?php
-						if ($status == 1) {
-							echo Display::return_icon('teachers.gif', get_lang('Teacher'), array('height' => '18'));
-						}else{
-							echo Display::return_icon('students.gif', get_lang('Student'), array('height' => '18'));
-						}
+                        if ($status == 1) {
+                            echo Display::return_icon('teachers.gif', get_lang('Teacher'), array('height' => '18'));
+                        } else {
+                            echo Display::return_icon('students.gif', get_lang('Student'), array('height' => '18'));
+                        }
 					?>
 				</div>
 				<div class="user-email"><?php echo $user['username']; ?></div>
 			</li>
 			<?php
-                }
-                unset($users);
-            ?>
+            }
+            unset($users);
+        ?>
 		</ul>
 	</div></div></div></div>
 	<?php