diff --git a/phpBB/templates/Default/index_body.tpl b/phpBB/templates/Default/index_body.tpl
index 0a6fc9cda6..84ea015453 100644
--- a/phpBB/templates/Default/index_body.tpl
+++ b/phpBB/templates/Default/index_body.tpl
@@ -45,7 +45,10 @@
 				<!-- END forumrow -->
 				<!-- END catrow -->
 				<tr class="catheader">
-					<td colspan="6">{TOTAL_USERS_ONLINE}<br/>{LOGGED_IN_USER_LIST}</td>
+					<td colspan="6"><a href="{U_VIEWONLINE}">Who is Online</a></td>
+				</tr>
+				<tr style="background-color:#DEDEDE">
+					<td colspan="6" align="left">{TOTAL_USERS_ONLINE}<br />{LOGGED_IN_USER_LIST}</td>
 				</tr>
 			</table></td>
 		</tr>
diff --git a/phpBB/templates/PSO/index_body.tpl b/phpBB/templates/PSO/index_body.tpl
index 3b04707863..00f32324eb 100644
--- a/phpBB/templates/PSO/index_body.tpl
+++ b/phpBB/templates/PSO/index_body.tpl
@@ -31,7 +31,7 @@
 			<!-- END forumrow -->
 			<!-- END catrow -->
 			<tr>
-				<td colspan="6" bgcolor="{T_TH_COLOR2}"><font face="{T_FONTFACE1}" size="{T_FONTSIZE3}"><b>Who is Online</b>&nbsp;</font></td>
+				<td colspan="6" bgcolor="{T_TH_COLOR2}"><font face="{T_FONTFACE1}" size="{T_FONTSIZE3}"><b><a href="{U_VIEWONLINE}">Who is Online</a></b>&nbsp;</font></td>
 			</tr>
 			<tr>
 				<td colspan="6" bgcolor="{T_TD_COLOR1}" align="left"><font face="{T_FONTFACE1}" size="{T_FONTSIZE1}">{TOTAL_USERS_ONLINE}</font><br><font face="{T_FONTFACE1}" size="{T_FONTSIZE2}">{LOGGED_IN_USER_LIST}</font></td>