diff --git a/phpBB/styles/subSilver/template/login_body.html b/phpBB/styles/subSilver/template/login_body.html
index b95e25b171..49e731139a 100644
--- a/phpBB/styles/subSilver/template/login_body.html
+++ b/phpBB/styles/subSilver/template/login_body.html
@@ -4,14 +4,14 @@
 
 <table class="tablebg" width="100%" cellspacing="1">
 <tr>
-	<th colspan="2">{L_LOGIN}</th>
+	<th <!-- IF not S_ADMIN_AUTH -->colspan="2"<!-- ENDIF -->>{L_LOGIN}</th>
 </tr>
 <!-- IF LOGIN_EXPLAIN -->
 	<tr>
-		<td class="row3" colspan="2" align="center"><span class="gensmall">{LOGIN_EXPLAIN}</td>
+		<td class="row3" <!-- IF not S_ADMIN_AUTH -->colspan="2"<!-- ENDIF -->align="center"><span class="gensmall">{LOGIN_EXPLAIN}</td>
 	</tr>
 <!-- ENDIF -->
-<tr>
+<tr><!-- IF not S_ADMIN_AUTH -->
 	<td class="row1" width="50%">
 		<p class="genmed">{L_LOGIN_INFO}</p>
 
@@ -19,7 +19,8 @@
 			<a href="{U_TERMS_USE}">{L_TERMS_USE}</a> | <a href="{U_PRIVACY}">{L_PRIVACY}</a>
 		</p>
 	</td>
-	<td class="row2">
+	<!-- ENDIF -->
+	<td <!-- IF not S_ADMIN_AUTH -->class="row2"<!-- ELSE -->class="row1" style="text-align: center;"<!-- ENDIF -->>
 	
 		<table cellspacing="1" cellpadding="4">
 		<!-- IF LOGIN_ERROR -->
@@ -29,7 +30,7 @@
 		<!-- ENDIF -->
 
 		<tr>
-			<td valign="top"><b class="gensmall">{L_USERNAME}:</b></td>
+			<td valign="top" <!-- IF S_ADMIN_AUTH -->style="text-align: right;"<!-- ENDIF -->><b class="gensmall">{L_USERNAME}:</b></td>
 			<td><input class="post" type="text" name="username" size="25" maxlength="40" value="{USERNAME}" tabindex="1" />
 				<!-- IF not S_ADMIN_AUTH -->
 					<br /><a class="gensmall" href="{U_REGISTER}">{L_REGISTER}</a>
@@ -37,8 +38,8 @@
 			</td>
 		</tr>
 		<tr>
-			<td valign="top"><b class="gensmall">{L_PASSWORD}:</b></td>
-			<td>
+			<td valign="top" <!-- IF S_ADMIN_AUTH -->style="text-align: right;"<!-- ENDIF -->><b class="gensmall">{L_PASSWORD}:</b></td>
+			<td <!-- IF S_ADMIN_AUTH -->style="text-align: left;"<!-- ENDIF -->>
 				<input class="post" type="password" name="password" size="25" maxlength="100" tabindex="2" />
 				<!-- IF U_SEND_PASSWORD --><br /><a class="gensmall" href="{U_SEND_PASSWORD}">{L_FORGOT_PASS}</a><!-- ENDIF -->
 				<!-- IF U_RESEND_ACTIVATION and not S_ADMIN_AUTH --><br /><a class="gensmall" href="{U_RESEND_ACTIVATION}">{L_RESEND_ACTIVATION}</a><!-- ENDIF -->