diff --git a/phpBB/language/lang_english.php b/phpBB/language/lang_english.php
index 4e43b66993..ffd5a013c2 100755
--- a/phpBB/language/lang_english.php
+++ b/phpBB/language/lang_english.php
@@ -425,4 +425,9 @@ $l_passexplain	= "Please fill out the form, a new password will be sent to your
 $l_sendpass	= "Send Password";
 
 
+
+// Full page login
+$l_autologin = "Log me on automatically each visit";
+$l_resend_password = "I have forgotten my password";
+
 ?>
diff --git a/phpBB/login.php b/phpBB/login.php
index 4890ed80e5..87e8bc4712 100644
--- a/phpBB/login.php
+++ b/phpBB/login.php
@@ -101,28 +101,29 @@ else
 		"PHPEX" => $phpEx,
 		"PHP_SELF" => $PHP_SELF,
 
-		"T_TR_COLOR1" => "#AA0000",
-		"T_TR_COLOR2" => "#AA0000",
-		"T_TR_COLOR3" => "#AA0000",
+		"T_TR_COLOR1" => "#",
+		"T_TR_COLOR2" => "#",
+		"T_TR_COLOR3" => "#",
 		"T_TH_COLOR1" => "#495FA8",
-		"T_TH_COLOR2" => "#AAAA00",
-		"T_TH_COLOR3" => "#AA00AA",
+		"T_TH_COLOR2" => "#",
+		"T_TH_COLOR3" => "#",
 		"T_TD_COLOR1" => "#000000",
 		"T_TD_COLOR2" => "#CCCCCC",
 		"T_TD_COLOR3" => "#DDDDDD",
 		"T_FONTFACE1" => "sans-serif",
-		"T_FONTFACE2" => "sans-serif",
-		"T_FONTFACE3" => "sans-serif",
+		"T_FONTFACE2" => "",
+		"T_FONTFACE3" => "",
 		"T_FONTSIZE1" => "2",
-		"T_FONTSIZE2" => "2",
-		"T_FONTSIZE3" => "2",
+		"T_FONTSIZE2" => "",
+		"T_FONTSIZE3" => "",
 		"T_FONTCOLOR1" => "#FFFFFF",
 		"T_FONTCOLOR2" => "#000000",
-		"T_FONTCOLOR3" => "2",
+		"T_FONTCOLOR3" => "",
 
 		"L_USERNAME" => $l_username,
 		"L_PASSWORD" => $l_password,
-		"L_SEND_PASSWORD" => "Send me a new password",
+		"L_SEND_PASSWORD" => $l_resend_password,
+		"L_AUTO_LOGIN" => $l_autologin,
 		"L_LOGIN" => $l_login,
 
 		"USERNAME" => $userdata['username']
diff --git a/phpBB/templates/Default/login_body.tpl b/phpBB/templates/Default/login_body.tpl
index 2de375fbbb..4b17a9fa39 100644
--- a/phpBB/templates/Default/login_body.tpl
+++ b/phpBB/templates/Default/login_body.tpl
@@ -15,13 +15,16 @@
 					<tr>
 						<td bgcolor="{T_TD_COLOR3}" align="right"><font face="verdana,serif" size="2" color="{T_FONTCOLOR2}">{L_PASSWORD}:&nbsp;</font></td><td bgcolor="{T_TD_COLOR3}"><input type="password" name="password" size="25" maxlength="25"></td>
 					</tr>
+					<tr>
+						<td colspan="2" bgcolor="{T_TD_COLOR3}" align="center"><font face="verdana,serif" size="2" color="{T_FONTCOLOR2}">{L_AUTO_LOGIN}</font>:&nbsp;<input type="checkbox" name="autologin"></td>
+					</tr>
 					<tr>
 						<td colspan="2" bgcolor="{T_TD_COLOR2}"><table width="100%" cellspacing="0" cellpadding="6" border="0">
 							<tr>
-								<td align="center"><font face="{T_FONTFACE1}" size="{T_FONTSIZE1}"><a href="sendpassword.{PHPEX}">{L_SEND_PASSWORD}</a></font></td>
+								<td align="center"><input type="submit" name="submit" value="{L_LOGIN}"></td>
 							</tr>
 							<tr>
-								<td align="center"><input type="submit" name="submit" value="{L_LOGIN}"></td>
+								<td align="center"><font face="{T_FONTFACE1}" size="{T_FONTSIZE1}"><a href="sendpassword.{PHPEX}">{L_SEND_PASSWORD}</a></font></td>
 							</tr>
 						</table></td>
 					</tr>
@@ -31,4 +34,5 @@
 	</tr>
 </table>
 
-</td></tr>
+	</td>
+</tr>
\ No newline at end of file