diff --git a/dashboard/src/passwordreset.html b/dashboard/src/passwordreset.html
index ee703b6d6..c7c6c8907 100644
--- a/dashboard/src/passwordreset.html
+++ b/dashboard/src/passwordreset.html
@@ -73,9 +73,11 @@
               <input type="text" class="form-control" id="inputPasswordResetIdentifier" name="passwordResetIdentifier" ng-model="passwordResetIdentifier" ng-disabled="busy" autofocus required>
             </div>
             <br/>
-            <button class="btn btn-primary btn-outline pull-right" type="submit" ng-disabled="busy || passwordResetForm.$invalid"><i class="fa fa-circle-notch fa-spin" ng-show="busy"></i> {{ 'passwordReset.resetAction' | tr }}</button>
+            <div class="card-form-bottom-bar">
+              <a href="/" class="hand">{{ 'passwordReset.backToLoginAction' | tr }}</a>
+              <button class="btn btn-primary btn-outline" type="submit" ng-disabled="busy || passwordResetForm.$invalid"><i class="fa fa-circle-notch fa-spin" ng-show="busy"></i> {{ 'passwordReset.resetAction' | tr }}</button>
+            </div>
           </form>
-          <a href="/" class="hand">{{ 'passwordReset.backToLoginAction' | tr }}</a>
         </div>
       </div>
     </div>
@@ -133,10 +135,11 @@
               <label class="control-label" for="inputPasswordResetTotpToken">{{ 'login.2faToken' | tr }}</label>
               <input type="text" class="form-control" name="passwordResetTotpToken" id="inputPasswordResetTotpToken" ng-model="totpToken" ng-disabled="busy" value="">
             </div>
-            <br/>
-            <button class="btn btn-primary btn-outline pull-right" type="submit" ng-disabled="busy || newPasswordForm.$invalid || newPassword !== newPasswordRepeat"><i class="fa fa-circle-notch fa-spin" ng-show="busy"></i> {{ 'passwordReset.passwordChanged.submitAction' | tr }}</button>
+            <div class="card-form-bottom-bar">
+              <a href="/" class="hand">{{ 'passwordReset.backToLoginAction' | tr }}</a>
+              <button class="btn btn-primary btn-outline" type="submit" ng-disabled="busy || newPasswordForm.$invalid || newPassword !== newPasswordRepeat"><i class="fa fa-circle-notch fa-spin" ng-show="busy"></i> {{ 'passwordReset.passwordChanged.submitAction' | tr }}</button>
+            </div>
           </form>
-          <a href="/" class="hand">{{ 'passwordReset.backToLoginAction' | tr }}</a>
         </div>
       </div>
     </div>
diff --git a/dashboard/src/theme.scss b/dashboard/src/theme.scss
index 32bd1d112..a9d4b39f7 100644
--- a/dashboard/src/theme.scss
+++ b/dashboard/src/theme.scss
@@ -828,6 +828,19 @@ multiselect {
     cursor: not-allowed;
 }
 
+// ----------------------------
+// Login and password forms
+// ----------------------------
+
+.card-form-bottom-bar {
+    display: flex;
+    justify-content: space-between;
+}
+
+.card-form-bottom-bar > * {
+    align-self: center;
+}
+
 // ----------------------------
 // Appstore view
 // ----------------------------
diff --git a/src/oidc_templates/login.ejs b/src/oidc_templates/login.ejs
index 997271688..b25d9e4d7 100644
--- a/src/oidc_templates/login.ejs
+++ b/src/oidc_templates/login.ejs
@@ -35,15 +35,6 @@
         margin-top: 20px;
       }
 
-      .action-bar {
-        display: flex;
-        justify-content: space-between;
-      }
-
-      .action-bar > * {
-        align-self: center;
-      }
-
       @media(min-width:620px) {
         .card {
           margin-bottom: 15px;
@@ -89,7 +80,7 @@
               <input type="text" class="form-control" name="totpToken" id="inputTotpToken" value="">
               <p class="has-error" id="totpError"></p>
             </div>
-            <div class="action-bar">
+            <div class="card-form-bottom-bar">
               <a href="/passwordreset.html">{{ login.resetPasswordAction }}</a>
               <button class="btn btn-primary btn-outline" type="submit">{{ login.signInAction }}</button>
             </div>