diff --git a/main/inc/ajax/online.ajax.php b/main/inc/ajax/online.ajax.php
index 3f3d919d49..bd8d4c80d6 100644
--- a/main/inc/ajax/online.ajax.php
+++ b/main/inc/ajax/online.ajax.php
@@ -14,7 +14,7 @@ switch($action) {
         
         $max_page = round(who_is_online_count()/10);
         
-        if (!in_array($page, $_SESSION['online_user_items']) && $page <= $max_page) {                          
+        if (!isset($_SESSION['online_user_items']) || (isset($_SESSION['online_user_items']) && !in_array($page, $_SESSION['online_user_items']) && $page <= $max_page)) {                          
             if (isset($_GET['cidReq']) && strlen($_GET['cidReq']) > 0) {
                 $user_list = who_is_online_in_this_course($page_rows, $page_rows + 10, api_get_user_id(), api_get_setting('time_limit_whosonline'), $_GET['cidReq']);
             } else {
diff --git a/main/messages/inbox.php b/main/messages/inbox.php
index b842b0d03f..58008c7155 100644
--- a/main/messages/inbox.php
+++ b/main/messages/inbox.php
@@ -107,7 +107,7 @@ if ($_GET['f']=='social') {
 } else {
 	$this_section = SECTION_MYPROFILE;
 	$interbreadcrumb[]= array ('url' => api_get_path(WEB_PATH).'main/auth/profile.php','name' => get_lang('Profile'));
-	$interbreadcrumb[]= array ('url' => '#','name' => get_lang('Inbox'));
+	//$interbreadcrumb[]= array ('url' => '#','name' => get_lang('Inbox'));
 }
 
 //Display::display_header('');
@@ -165,6 +165,8 @@ if (api_get_setting('allow_social_tool') == 'true') {
     $tpl->assign('social_right_content', $social_right_content);
     $social_layout = $tpl->get_template('layout/social_layout.tpl');
     $content = $tpl->fetch($social_layout);
+} else {
+    $content = $social_right_content;
 }
 $tpl->assign('actions', $actions);
 $tpl->assign('message', $show_message);
diff --git a/main/messages/new_message.php b/main/messages/new_message.php
index b6b0d99598..3ca5b4b7c6 100644
--- a/main/messages/new_message.php
+++ b/main/messages/new_message.php
@@ -361,6 +361,8 @@ if (api_get_setting('allow_social_tool') == 'true') {
     $tpl->assign('social_right_content', $social_right_content);
     $social_layout = $tpl->get_template('layout/social_layout.tpl');
     $content = $tpl->fetch($social_layout);
+} else {
+    $content = $social_right_content;
 }
 $tpl->assign('actions', $actions);
 $tpl->assign('message', $show_message);
diff --git a/whoisonline.php b/whoisonline.php
index 14fe6b6a9f..f855e22a1c 100644
--- a/whoisonline.php
+++ b/whoisonline.php
@@ -165,10 +165,6 @@ if ((api_get_setting('showonline', 'world') == 'true' && !$_user['user_id']) ||
 				//this include the social menu div
 				$social_left_content = SocialManager::show_social_menu('whoisonline');				
 			}			
-		} else {
-			$social_right_content .= '<div class="actions-title">';
-			$social_right_content .= get_lang('UsersOnLineList');
-			$social_right_content .= '</div>';
 		}
 	}