diff --git a/forms/src/main/resources/META-INF/resources/forms/theme/default/login.ftl b/forms/src/main/resources/META-INF/resources/forms/theme/default/login.ftl
index be4c793d6f..2e90a5d3b1 100755
--- a/forms/src/main/resources/META-INF/resources/forms/theme/default/login.ftl
+++ b/forms/src/main/resources/META-INF/resources/forms/theme/default/login.ftl
@@ -13,7 +13,7 @@
     <div id="form">
         <form action="${url.loginAction}" method="post">
             <div>
-                <label for="username">${rb.getString('username')}</label><input id="username" name="username" value="${login.username!''}" type="text" />
+                <label for="username">${rb.getString('username')}</label><input id="username" name="username" value="${login.username!''}" type="text" autofocus />
             </div>
 
             <#list login.requiredCredentials as c>
@@ -22,11 +22,11 @@
                 </div>
             </#list>
 
+            <input class="btn-primary" type="submit" value="Log In"/>
+
             <div class="aside-btn">
                 <p>Forgot <a href="${url.loginPasswordResetUrl}">Password</a>?</p>
             </div>
-
-            <input class="btn-primary" type="submit" value="Log In"/>
         </form>
     </div>