2 files changed, 8 insertions, 10 deletions

diff --git a/tpl/default/changepassword.html b/tpl/default/changepassword.html
index 3867e3ca..ab579433 100644
--- a/tpl/default/changepassword.html
+++ b/tpl/default/changepassword.html
@@ -11,10 +11,10 @@
     <h2 class="window-title">{"Change password"|t}</h2>
     <form method="POST" action="#" name="changepasswordform" id="changepasswordform">
       <div>
-        <input type="password" name="oldpassword" placeholder="{'Current password'|t}" class="autofocus">
+        <input type="password" name="oldpassword" aria-label="{'Current password'|t}" placeholder="{'Current password'|t}" class="autofocus">
       </div>
       <div>
-        <input type="password" name="setpassword" placeholder="{'New password'|t}">
+        <input type="password" name="setpassword" aria-label="{'New password'|t}" placeholder="{'New password'|t}">
       </div>
       <input type="hidden" name="token" value="{$token}">
       <div>
diff --git a/tpl/default/loginform.html b/tpl/default/loginform.html
index bfc54815..761aec0c 100644
--- a/tpl/default/loginform.html
+++ b/tpl/default/loginform.html
@@ -9,7 +9,7 @@
 <div class="pure-g pure-alert pure-alert-error pure-alert-closable center">
   <div class="pure-u-2-24"></div>
   <div class="pure-u-20-24">
-    {'You have been banned after too many failed login attempts. Try again later.'|t}
+    <p>{'You have been banned after too many failed login attempts. Try again later.'|t}</p>
   </div>
   <div class="pure-u-2-24">
     <i class="fa fa-times pure-alert-close"></i>
@@ -22,20 +22,19 @@
       <form method="post" name="loginform">
         <h2 class="window-title">{'Login'|t}</h2>
         <div>
-          <input type="text" name="login" placeholder="{'Username'|t}"
-             {if="!empty($username)"}value="{$username}"{/if} class="autofocus" tabindex="20">
+          <input type="text" name="login" aria-label="{'Username'|t}" placeholder="{'Username'|t}"
+             {if="!empty($username)"}value="{$username}"{/if} class="autofocus">
         </div>
         <div>
-          <input type="password" name="password" placeholder="{'Password'|t}" class="autofocus" tabindex="21">
+          <input type="password" name="password" aria-label="{'Password'|t}" placeholder="{'Password'|t}" class="autofocus">
         </div>
         <div class="remember-me">
           <input type="checkbox" name="longlastingsession" id="longlastingsessionform"
-             {if="$remember_user_default"}checked="checked"{/if}
-             tabindex="22">
+             {if="$remember_user_default"}checked="checked"{/if}>
           <label for="longlastingsessionform">{'Remember me'|t}</label>
         </div>
         <div>
-          <input type="submit" value="{'Login'|t}" class="bigbutton" tabindex="23">
+          <input type="submit" value="{'Login'|t}" class="bigbutton">
         </div>
         <input type="hidden" name="token" value="{$token}">
         {if="$returnurl"}<input type="hidden" name="returnurl" value="{$returnurl}">{/if}
@@ -48,4 +47,3 @@
 {include="page.footer"}
 </body>
 </html>
-