diff --git a/app/common/auth/login.html b/app/common/auth/login.html
index 269ad9cc7b..3e68d134a6 100644
--- a/app/common/auth/login.html
+++ b/app/common/auth/login.html
@@ -6,7 +6,7 @@
 
         <div class="form-field">
             <label for="email" translate>user.email</label>
-            <input type="text" id="email" ng-model="email" ng-disabled="processing" placeholder="name@domain.com" required>
+            <input type="email" id="email" ng-model="email" ng-disabled="processing" placeholder="name@domain.com" required>
         </div>
 
         <div class="form-field">
@@ -17,7 +17,7 @@
     </div>
     <div class="modal-actions">
         <div class="form-field">
-            <button type="button" class="button-beta" ng-click="cancel()" ng-show="showCancel" translate="app.cancel">Cancel</button>
+            <button type="button" class="button-link" ng-click="cancel()" ng-show="showCancel" translate="app.cancel" aria-label="cancel">Cancel</button>
             <button type="submit" class="button-alpha" ng-disabled="loginForm.$invalid || processing" translate="nav.login">Login</button>
         </div>
     </div>
diff --git a/app/common/auth/password-reset-confirm.html b/app/common/auth/password-reset-confirm.html
index 448d60cf45..0b07b222f2 100644
--- a/app/common/auth/password-reset-confirm.html
+++ b/app/common/auth/password-reset-confirm.html
@@ -33,7 +33,7 @@
             </div>
         </div>
         <div class="form-field">
-            <button type="button" class="button-link" ng-click="cancel()" translate="app.cancel">Cancel</button>
+            <button type="button" class="button-link" ng-click="cancel()" translate="app.cancel" aria-label="cancel">Cancel</button>
             <button type="submit" class="button-primary"
                 ng-disabled="form.$invalid || processing">
                     <div class="loading" ng-show="processing"><div class="line"></div><div class="line"></div><div class="line"></div></div>
diff --git a/app/common/auth/password-reset.html b/app/common/auth/password-reset.html
index e0ab884094..7707c32fb3 100644
--- a/app/common/auth/password-reset.html
+++ b/app/common/auth/password-reset.html
@@ -7,13 +7,13 @@
                 translate>
                 user.email
             </label>
-            <input type="text" id="email" name="email"
+            <input type="email" id="email" name="email"
                 ng-model="email"
                 ng-disabled="processing"
                 required>
         </div>
         <div class="form-field">
-            <button type="button" class="button-link" ng-click="cancel()" translate="app.cancel">Cancel</button>
+            <button type="button" class="button-link" ng-click="cancel()" translate="app.cancel" aria-label="cancel">Cancel</button>
             <button type="submit" class="button-primary"
                 ng-disabled="form.$invalid || processing">
                     <div class="loading" ng-show="processing"><div class="line"></div><div class="line"></div><div class="line"></div></div>
diff --git a/app/common/auth/register.html b/app/common/auth/register.html
index c3847a32cd..7cdef49c6d 100644
--- a/app/common/auth/register.html
+++ b/app/common/auth/register.html
@@ -59,7 +59,7 @@
 
     <div class="modal-actions">
         <div class="form-field">
-            <button type="button" class="button-beta" ng-click="cancel()" translate="app.cancel">Cancel</button>
+            <button type="button" class="button-link" ng-click="cancel()" translate="app.cancel" aria-label="cancel">Cancel</button>
             <button type="submit" class="button-alpha" ng-disabled="form.$invalid || processing" translate="nav.register">Sign up</button>
         </div>
     </div>