diff --git a/templates/login.tpl b/templates/login.tpl
index 090dadf9..a6e7ad21 100644
--- a/templates/login.tpl
+++ b/templates/login.tpl
@@ -10,37 +10,37 @@
     </div>
 </nav>
 
-<div id="login" class="container text-center">
-    <h2>{if $logintype=='admin'}{$PALANG.pLogin_welcome}
-        {else}{$PALANG.pUsersLogin_welcome}
-        {/if}</h2>
+<div id="login" class="container">
+
+    <h2 class="h2">{if $logintype=='admin'}{$PALANG.pLogin_welcome}{else}{$PALANG.pUsersLogin_welcome}{/if}</h2>
+
     <div class="well">
+
         <form name="frmLogin" method="post" action="" role="form" class="form-signin">
-            <input class="flat" type="hidden" name="token" value="{$smarty.session.PFA_token|escape:"url"}"/>
+            <input type="hidden" name="token" value="{$smarty.session.PFA_token|escape:"url"}"/>
             <div class="form-group">
-                <label class="control-label" for="fUsername">{$PALANG.pLogin_username}:</label>
-                <input class="flat form-control" type="text" name="fUsername" id="fUsername"/>
+                <label for="fUsername">{$PALANG.pLogin_username}:</label>
+                <input class="form-control" type="text" name="fUsername" id="fUsername"/>
             </div>
             <div class="form-group">
-                <label class="control-label" for="fPassword">{$PALANG.password}:</label>
-                <input class="flat form-control" type="password" name="fPassword" id="fPassword"/>
+                <label for="fPassword">{$PALANG.password}:</label>
+                <input class="form-control" type="password" name="fPassword" id="fPassword"/>
             </div>
             {if $forgotten_password_reset}
                 <div class="form-group row">
                     <div class="col-sm-6 col-sm-offset-3 reset-button">
-                        <a class="btn btn-default btn-block" role="button" href="password-recover.php"><span
-                                    class="glyphicon glyphicon-refresh"
-                                    aria-hidden="true"></span> {$PALANG.pUsersLogin_password_recover}</a>
+                        <a class="btn btn-default btn-block" role="button" href="password-recover.php">
+                            <span class="glyphicon glyphicon-refresh" aria-hidden="true"></span>
+                            {$PALANG.pUsersLogin_password_recover}</a>
                     </div>
                 </div>
             {/if}
             <div class="form-group">
-                <label class="control-label">{$PALANG.pLogin_language}:</label>
+                <label for=lang>{$PALANG.pLogin_language}:</label>
                 {$language_selector}
             </div>
             <div class="text-center">
-                <input class="btn btn-primary btn-lg btn-block" type="submit" name="submit"
-                       value="{$PALANG.pLogin_button}"/>
+                <button class="btn btn-primary btn-lg" type="submit" name="submit" value="{$PALANG.pLogin_button}">{$PALANG.pLogin_button}</button>
             </div>
         </form>
         {if $logintype == 'admin'}
@@ -50,12 +50,8 @@
             </div>
         {/if}
     </div>
-    {literal}
-        <script type="text/javascript">
-            <!--
-            document.frmLogin.fUsername.focus();
-            // -->
-        </script>
-    {/literal}
+    <script type="text/javascript">
+        document.frmLogin.fUsername.focus();
+    </script>
 </div>
 
diff --git a/templates/users_edit-alias.tpl b/templates/users_edit-alias.tpl
index 714bb351..e25dfa5c 100644
--- a/templates/users_edit-alias.tpl
+++ b/templates/users_edit-alias.tpl
@@ -36,12 +36,15 @@
             </div>
         </div>
         <div class="panel-footer">
-            <div class="btn-toolbar" role="toolbar">
-                <div class="btn-group pull-right">
-                    <input class="btn btn-primary" type="submit" name="submit" value="{$PALANG.save}"/>
-                    <input class="btn btn-primary" type="submit" name="fCancel" value="{$PALANG.exit}"/>
+
+            <div class="btn-toolbar">
+                <div class="pull-right">
+                    <a href="main.php" class="mr btn btn-secondary">{$PALANG.exit}</a>
+
+                    <button class="ml btn btn-lg btn-primary" type="submit" name="submit" value="{$PALANG.save}">{$PALANG.save}</button>
                 </div>
             </div>
+
         </div>
     </div>
 </form>