diff --git a/phpBB/templates/Default/overall_header.tpl b/phpBB/templates/Default/overall_header.tpl
index c38a8c84b9..f947f7d510 100644
--- a/phpBB/templates/Default/overall_header.tpl
+++ b/phpBB/templates/Default/overall_header.tpl
@@ -50,7 +50,7 @@ A:Hover {
 				<td bgcolor="#CCCCCC"><table width="100%" cellspacing="1" cellpadding="3" border="0">
 					<tr class="tablebody"><form method="post" action="{S_LOGIN_ACTION}">
 						<td align="left" valign="top"><a href="{U_INDEX}"><img src="images/title.jpg" height="55" width="450" border="0"></a></td>
-						<td align="right">{L_USERNAME} : <input type="text" name="username"><br>{L_PASSWORD} : <input type="password" name="password"><br>{L_LOG_ME_IN}<input type="checkbox" name="autologin">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<input type="submit" name="submit" value="{L_LOGIN}"></td>
+						<td align="right">{S_LOGINBOX}</td>
 					</tr></form>
 					<tr class="tablebody">
 						<td colspan="2"><table width="100%" cellspacing="0" cellpadding="0" border="0">
diff --git a/phpBB/templates/PSO/overall_header.tpl b/phpBB/templates/PSO/overall_header.tpl
index 844a2b406f..b3a1d1e3d7 100644
--- a/phpBB/templates/PSO/overall_header.tpl
+++ b/phpBB/templates/PSO/overall_header.tpl
@@ -5,8 +5,18 @@
 <title>phpBB - {SITENAME}</title>
 <style type="text/css">
 <!--
-	SELECT.small	{width:140px;font-family:"Courier New",courier;font-size:8pt;}
-	INPUT.text		{font-family:"Courier New",courier;font-size:8pt;}
+
+TD.tablebg {background-color:{T_TH_COLOR1};}
+TH {}
+TD.categories {}
+TD.row_1 {}
+TD.row_2 {}
+
+SPAN.general {}
+
+SELECT.small	{width:140px;font-family:"Courier New",courier;font-size:8pt;}
+INPUT.text		{font-family:"Courier New",courier;font-size:8pt;}
+
 //-->
 </style>
 </head>
@@ -16,7 +26,7 @@
 
 <div align="center"><table width="98%" cellpadding="1" cellspacing="0" border="0">
 	<tr>
-		<td width="100%" bgcolor="{T_TH_COLOR1}"><table width="100%" cellspacing="1" cellpadding="4" border="0">
+		<td class="tablebg" width="100%"><table width="100%" cellspacing="1" cellpadding="4" border="0">
 			<tr>
 				<td bgcolor="{T_TH_COLOR2}"><table width="100%" cellspacing="0" border="0">
 					<tr>
@@ -28,18 +38,17 @@
 			<tr>
 				<td bgcolor="{T_TD_COLOR1}"><table width="100%" cellspacing="0" cellpadding="4" border="0">
 					<tr>
-						<td><font face="{T_FONTFACE1}" size="{T_FONTSIZE1}"><a href="{U_REGISTER}">{L_REGISTER}</a>&nbsp;|&nbsp<a href="{U_MEMBERLIST}">{L_MEMBERLIST}</a>&nbsp;|&nbsp;<a href="{U_SEARCH}">{L_SEARCH}</a>&nbsp;|&nbsp;<a href="{U_FAQ}">{L_FAQ}</a></font></td>
-						<td align="right"><font face="{T_FONTFACE1}" size="{T_FONTSIZE1}"><a href="{U_PRIVATEMSGS}">{L_PRIVATEMSGS}</a>&nbsp;|&nbsp;<a href="{U_PROFILE}">{L_PROFILE}</a>&nbsp;|&nbsp;<a href="{U_GROUP_ADMIN}">{L_USERGROUPS}</a>&nbsp;|&nbsp;<a href="{U_LOGIN_LOGOUT}">{L_LOGIN_LOGOUT}</a></font></td>
+						<td><font face="{T_FONTFACE1}" size="{T_FONTSIZE1}"><a href="{U_FAQ}">{L_FAQ}</a>&nbsp;|&nbsp;<a href="{U_MEMBERLIST}">{L_MEMBERLIST}</a>&nbsp;|&nbsp;<a href="{U_REGISTER}">{L_REGISTER}</a>&nbsp;|&nbsp<a href="{U_SEARCH}">{L_SEARCH}</a></font></td>
+						<td align="center"><font face="{T_FONTFACE1}" size="{T_FONTSIZE1}">{L_LAST_VISIT} {S_LAST_VISIT_DATE}</font></td>
+						<td align="right"><font face="{T_FONTFACE1}" size="{T_FONTSIZE1}"><a href="{U_PROFILE}">{L_PROFILE}</a>&nbsp;|&nbsp;<a href="{U_GROUP_ADMIN}">{L_USERGROUPS}</a>&nbsp;|&nbsp;<a href="{U_LOGIN_LOGOUT}">{L_LOGIN_LOGOUT}</a></font></td>
 					</tr>
-					<tr><form method="post" action="{S_LOGIN_ACTION}">
-						<td colspan="2" align="right" valign="bottom"><font face="{T_FONTFACE1}" size="{T_FONTSIZE1}">{L_USERNAME}: <input class="text" type="text" name="username">&nbsp;&nbsp;&nbsp;{L_PASSWORD}: <input type="password" name="password">&nbsp;&nbsp;&nbsp;{L_AUTO_LOGIN}</font>:&nbsp;<input class="text" type="checkbox" name="autologin">&nbsp;&nbsp;&nbsp;<input type="submit" name="submit" value="{L_LOGIN}">&nbsp;</font></td>
-					</form></tr>
+{S_LOGINBOX}
 				</table></td>
 			</tr>
 		</table></td>
 	</tr>
 	<tr>
-		<td width="100%"><font face="{T_FONTFACE1}" size="{T_FONTSIZE1}">{L_LAST_VISIT} {S_LAST_VISIT_DATE}</font></td>
+		
 	</tr>
 </table></div>