diff --git a/kallithea/templates/login.html b/kallithea/templates/login.html
--- a/kallithea/templates/login.html
+++ b/kallithea/templates/login.html
@@ -42,15 +42,20 @@
                     </div>
                 </div>
 
-            <div class="links">
-                ${h.link_to(_('Forgot your password ?'),h.url('reset_password'))}
-                %if h.HasPermissionAny('hg.admin', 'hg.register.auto_activate', 'hg.register.manual_activate')():
-                  /
-                 ${h.link_to(_("Don't have an account ?"),h.url('register'))}
-                %endif
-                <span class="buttons">
+            <div class="form-group">
+                <div>
+                    ${h.link_to(_('Forgot your password ?'),h.url('reset_password'))}
+                    %if h.HasPermissionAny('hg.admin', 'hg.register.auto_activate', 'hg.register.manual_activate')():
+                        /
+                        ${h.link_to(_("Don't have an account ?"),h.url('register'))}
+                    %endif
+                </div>
+            </div>
+
+            <div class="form-group">
+                <div class="buttons">
                     ${h.submit('sign_in',_('Sign In'),class_="btn btn-default")}
-                </span>
+                </div>
             </div>
         </div>
         ${h.end_form()}
diff --git a/kallithea/templates/password_reset.html b/kallithea/templates/password_reset.html
--- a/kallithea/templates/password_reset.html
+++ b/kallithea/templates/password_reset.html
@@ -34,9 +34,9 @@
                 </div>
                 %endif
 
-                <div class="buttons">
-                    <div class="nohighlight">
-                      ${h.submit('send',_('Send Password Reset Email'),class_="btn btn-default")}
+                <div class="form-group">
+                    <div class="buttons">
+                        ${h.submit('send',_('Send Password Reset Email'),class_="btn btn-default")}
                     </div>
                 </div>
 
diff --git a/kallithea/templates/password_reset_confirmation.html b/kallithea/templates/password_reset_confirmation.html
--- a/kallithea/templates/password_reset_confirmation.html
+++ b/kallithea/templates/password_reset_confirmation.html
@@ -45,9 +45,7 @@
 
                 <div class="form-group">
                     <div class="buttons">
-                        <div class="nohighlight">
-                            ${h.submit('send',_('Confirm'),class_="btn btn-default")}
-                        </div>
+                        ${h.submit('send',_('Confirm'),class_="btn btn-default")}
                     </div>
                 </div>
         </div>
diff --git a/kallithea/templates/register.html b/kallithea/templates/register.html
--- a/kallithea/templates/register.html
+++ b/kallithea/templates/register.html
@@ -70,8 +70,8 @@
                 </div>
                 %endif
 
-                <div class="buttons">
-                    <div class="nohighlight">
+                <div class="form-group">
+                    <div class="buttons">
                         ${h.submit('sign_up',_('Sign Up'),class_="btn btn-default")}
                         %if c.auto_active:
                             <div class="alert alert-info">${_('Registered accounts are ready to use and need no further action.')}</div>