diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index a453ad9edb..b5e6f5671a 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -1675,7 +1675,7 @@ function page_header($page_title = '')
 						$logged_hidden_online++;
 					}
 
-					if ($row['user_allow_viewonline'] || $auth->acl_get('u_viewonline'))
+					if ( ($row['user_allow_viewonline'] && $row['session_viewonline']) || $auth->acl_get('u_viewonline') )
 					{
 						$user_online_link = ($row['user_type'] <> USER_IGNORE) ? "<a href=\"{$phpbb_root_path}memberlist.$phpEx$SID&amp;mode=viewprofile&amp;u=" . $row['user_id'] . '">' . $user_online_link . '</a>' : $user_online_link;
 						$online_userlist .= ($online_userlist != '') ? ', ' . $user_online_link : $user_online_link;