diff --git a/tpl/loginform.html b/tpl/loginform.html
index 805a0148..6c2abcd3 100644
--- a/tpl/loginform.html
+++ b/tpl/loginform.html
@@ -1,26 +1,38 @@
 <!DOCTYPE html>
 <html>
-<head>{include="includes"}</head>
-<body{if="ban_canLogin()"} onload="document.loginform.login.focus();"{/if}>
-<div id="pageheader">
-	{include="page.header"}
+  <head>
+    {include="includes"}
+  </head>
+  <body>
+    <div id="pageheader">
+      {include="page.header"}
 
-	<div id="headerform">
-{if="!ban_canLogin()"}
-    You have been banned from login after too many failed attempts. Try later.
-{else}
-    <form method="post" name="loginform">
-    Login: <input type="text" name="login" tabindex="1">&nbsp;&nbsp;&nbsp;
-    Password : <input type="password" name="password" tabindex="2">
-    <input type="submit" value="Login" class="bigbutton" tabindex="4"><br>
-    <input style="margin:10 0 0 40;" type="checkbox" name="longlastingsession" id="longlastingsession"  tabindex="3"><label for="longlastingsession">&nbsp;Stay signed in (Do not check on public computers)</label>
-    <input type="hidden" name="token" value="{$token}">
-    {if="$returnurl"}<input type="hidden" name="returnurl" value="{$returnurl|htmlspecialchars}">{/if}
-    </form>
-{/if}
+      <div id="headerform">
+        {if="!ban_canLogin()"}
+        You have been banned from login after too many failed attempts. Try later.
+        {else}
+        <form method="post" id="configform" class="configform">
+          <p>
+            <label for="login">Login :</label>
+            <input type="text" name="login" id="login" tabindex="1" autofocus />
+            <label for="password">Password :</label>
+            <input type="password" name="password" id="password" tabindex="2">
+          </p>
+          <p>
+            <input type="checkbox" name="longlastingsession" id="longlastingsession" tabindex="3">
+            <label for="longlastingsession">&nbsp;Stay signed in (Do not check on public computers)</label>
+          </p>
+          <p>
+            {if="$returnurl"}
+            <input type="hidden" name="returnurl" value="{$returnurl|htmlspecialchars}">
+            {/if}
+            <input type="hidden" name="token" value="{$token}">
+            <input type="submit" value="Login" class="bigbutton" tabindex="4" />
+          </p>
+        </form>
+        {/if}
+      </div>
     </div>
-</div>
-
-{include="page.footer"}
-</body>
+    {include="page.footer"}
+  </body>
 </html>
\ No newline at end of file
