diff --git a/phpBB/templates/Default/index_header.tpl b/phpBB/templates/Default/index_header.tpl
index 9b68cd67c3..4785c0b5b6 100644
--- a/phpBB/templates/Default/index_header.tpl
+++ b/phpBB/templates/Default/index_header.tpl
@@ -7,8 +7,8 @@
         <tr>
 	        <td align="right" style="{font-size: 8pt;}">{L_POSTEDTOTAL} -<b>{TOTAL_POSTS}</b>- {L_MESSAGES}.<br>
 	          {L_WEHAVE} <b>{TOTAL_USERS}</b> {L_REGUSERS}.<br>
-	          {L_NEWESTUSER} <b><a href="profile.php?mode=viewprofile&user_id={NEWEST_UID}">{NEWEST_USER}</a></b><br>
-	          {L_ARECURRENTLY} <a href="whosonline.php"><b>{USERS_BROWSING}</b> {L_BROWSING}</a> {L_THEFORUMS}<br>
+	          {L_NEWESTUSER} <b><a href="profile.{PHPEX}?mode=viewprofile&user_id={NEWEST_UID}">{NEWEST_USER}</a></b><br>
+	          {L_ARECURRENTLY} <a href="viewonline.{PHPEX}"><b>{USERS_BROWSING}</b> {L_BROWSING}</a> {L_THEFORUMS}<br>
 	        </td>
 	      </tr>
 	    </table>
diff --git a/phpBB/templates/Default/viewonline_body.tpl b/phpBB/templates/Default/viewonline_body.tpl
index 4641c1dfe1..4cf06d04c1 100644
--- a/phpBB/templates/Default/viewonline_body.tpl
+++ b/phpBB/templates/Default/viewonline_body.tpl
@@ -3,16 +3,20 @@
 		<tr>
 			<td><table border="0" width="100%" cellpadding="3" cellspacing="1">
 				<tr class="tableheader">
-					<td colspan="2" align="center"><b>{L_WHOSONLINE}</b></td>
+					<td colspan="4" align="center"><b>{L_WHOSONLINE}</b></td>
 				</tr>
 				<tr class="catheader">
-					<td align="center">{L_USERNAME}</td>
-					<td align="center">{L_LOCATION}</td>
+					<td width="30%" align="center">&nbsp;{L_USERNAME}&nbsp;</td>
+					<td width="20%" align="center">&nbsp;{L_LAST_UPDATE}&nbsp;</td>
+					<td width="10%" align="center">&nbsp;{L_LOGGED_ON}&nbsp;</td>
+					<td width="40%" align="center">&nbsp;{L_LOCATION}&nbsp;</td>
 				</tr>
 				<!-- BEGIN userrow -->
 				<tr bgcolor="{userrow.ROW_COLOR}" class="tablebody">
-					<td><a href="profile.{PHPEX}?mode=view&{POST_USER_URL}={userrow.USER_ID}">{userrow.USERNAME}</a></td>
-					<td><a href="{userrow.LOCATION_URL}">{userrow.LOCATION}</a></td>
+					<td width="30%">&nbsp;<a href="profile.{PHPEX}?mode=view&{POST_USER_URL}={userrow.USER_ID}">{userrow.USERNAME}</a>&nbsp;</td>
+					<td width="20%" align="center">&nbsp;{userrow.LASTUPDATE}&nbsp;</td>
+					<td width="10%" align="center">&nbsp;{userrow.LOGGEDON}&nbsp;</td>
+					<td width="40%">&nbsp;<a href="{userow.LOCATION_URL}">&nbsp;{userrow.LOCATION}</a>&nbsp;</td>
 				</tr>
 				<!-- END userrow -->
 			</table></td>