diff --git a/src/app/accounts/login.component.html b/src/app/accounts/login.component.html
index b0817860a7..dd794040d8 100644
--- a/src/app/accounts/login.component.html
+++ b/src/app/accounts/login.component.html
@@ -1,96 +1,98 @@
-<div class="login-header">
-  <a
-    href="#"
-    appStopClick
-    (click)="settings()"
-    class="environment-urls-settings-icon"
-    attr.aria-label="{{ 'settings' | i18n }}"
+<div id="login-page">
+  <div class="login-header">
+    <a
+      href="#"
+      appStopClick
+      (click)="settings()"
+      class="environment-urls-settings-icon"
+      attr.aria-label="{{ 'settings' | i18n }}"
+    >
+      <i class="bwi bwi-cog bwi-lg" aria-hidden="true"></i>
+      {{ "settings" | i18n }}
+    </a>
+  </div>
+  <form
+    id="login-page"
+    #form
+    (ngSubmit)="submit()"
+    [appApiAction]="formPromise"
+    attr.aria-hidden="{{ showingModal }}"
   >
-    <i class="bwi bwi-cog bwi-lg" aria-hidden="true"></i>
-    {{ "settings" | i18n }}
-  </a>
-</div>
-<form
-  id="login-page"
-  #form
-  (ngSubmit)="submit()"
-  [appApiAction]="formPromise"
-  attr.aria-hidden="{{ showingModal }}"
->
-  <div id="content" class="content">
-    <img class="logo-image" alt="Bitwarden" />
-    <p class="lead">{{ "loginOrCreateNewAccount" | i18n }}</p>
-    <div class="box last">
-      <div class="box-content">
-        <div class="box-content-row" appBoxRow>
-          <label for="email">{{ "emailAddress" | i18n }}</label>
-          <input
-            id="email"
-            type="text"
-            name="Email"
-            [(ngModel)]="email"
-            required
-            appInputVerbatim="false"
-          />
-        </div>
-        <div class="box-content-row box-content-row-flex" appBoxRow>
-          <div class="row-main">
-            <label for="masterPassword">{{ "masterPass" | i18n }}</label>
+    <div id="content" class="content">
+      <img class="logo-image" alt="Bitwarden" />
+      <p class="lead">{{ "loginOrCreateNewAccount" | i18n }}</p>
+      <div class="box last">
+        <div class="box-content">
+          <div class="box-content-row" appBoxRow>
+            <label for="email">{{ "emailAddress" | i18n }}</label>
             <input
-              id="masterPassword"
-              type="{{ showPassword ? 'text' : 'password' }}"
-              name="MasterPassword"
-              class="monospaced"
-              [(ngModel)]="masterPassword"
+              id="email"
+              type="text"
+              name="Email"
+              [(ngModel)]="email"
               required
-              appInputVerbatim
+              appInputVerbatim="false"
             />
           </div>
-          <div class="action-buttons">
-            <a
-              class="row-btn"
-              href="#"
-              appStopClick
-              appBlurClick
-              role="button"
-              appA11yTitle="{{ 'toggleVisibility' | i18n }}"
-              (click)="togglePassword()"
-            >
-              <i
-                class="bwi bwi-lg"
-                aria-hidden="true"
-                [ngClass]="{ 'bwi-eye': !showPassword, 'bwi-eye-slash': showPassword }"
-              ></i>
-            </a>
+          <div class="box-content-row box-content-row-flex" appBoxRow>
+            <div class="row-main">
+              <label for="masterPassword">{{ "masterPass" | i18n }}</label>
+              <input
+                id="masterPassword"
+                type="{{ showPassword ? 'text' : 'password' }}"
+                name="MasterPassword"
+                class="monospaced"
+                [(ngModel)]="masterPassword"
+                required
+                appInputVerbatim
+              />
+            </div>
+            <div class="action-buttons">
+              <a
+                class="row-btn"
+                href="#"
+                appStopClick
+                appBlurClick
+                role="button"
+                appA11yTitle="{{ 'toggleVisibility' | i18n }}"
+                (click)="togglePassword()"
+              >
+                <i
+                  class="bwi bwi-lg"
+                  aria-hidden="true"
+                  [ngClass]="{ 'bwi-eye': !showPassword, 'bwi-eye-slash': showPassword }"
+                ></i>
+              </a>
+            </div>
+          </div>
+          <div class="box-content-row" [hidden]="!showCaptcha()">
+            <iframe id="hcaptcha_iframe" height="80"></iframe>
           </div>
         </div>
-        <div class="box-content-row" [hidden]="!showCaptcha()">
-          <iframe id="hcaptcha_iframe" height="80"></iframe>
+      </div>
+
+      <div class="buttons with-rows">
+        <div class="buttons-row">
+          <button type="submit" class="btn primary block" [disabled]="form.loading" appBlurClick>
+            <b [hidden]="form.loading"
+              ><i class="bwi bwi-sign-in" aria-hidden="true"></i> {{ "logIn" | i18n }}</b
+            >
+            <i class="bwi bwi-spinner bwi-spin" [hidden]="!form.loading" aria-hidden="true"></i>
+          </button>
+          <a routerLink="/register" class="btn block">
+            <i class="bwi bwi-pencil-square" aria-hidden="true"></i> {{ "createAccount" | i18n }}
+          </a>
+        </div>
+        <div class="buttons-row">
+          <a (click)="launchSsoBrowser('desktop', 'bitwarden://sso-callback')" class="btn block">
+            <i class="bwi bwi-bank" aria-hidden="true"></i> {{ "enterpriseSingleSignOn" | i18n }}
+          </a>
         </div>
       </div>
-    </div>
-
-    <div class="buttons with-rows">
-      <div class="buttons-row">
-        <button type="submit" class="btn primary block" [disabled]="form.loading" appBlurClick>
-          <b [hidden]="form.loading"
-            ><i class="bwi bwi-sign-in" aria-hidden="true"></i> {{ "logIn" | i18n }}</b
-          >
-          <i class="bwi bwi-spinner bwi-spin" [hidden]="!form.loading" aria-hidden="true"></i>
-        </button>
-        <a routerLink="/register" class="btn block">
-          <i class="bwi bwi-pencil-square" aria-hidden="true"></i> {{ "createAccount" | i18n }}
-        </a>
-      </div>
-      <div class="buttons-row">
-        <a (click)="launchSsoBrowser('desktop', 'bitwarden://sso-callback')" class="btn block">
-          <i class="bwi bwi-bank" aria-hidden="true"></i> {{ "enterpriseSingleSignOn" | i18n }}
-        </a>
+      <div class="sub-options">
+        <a routerLink="/hint">{{ "getMasterPasswordHint" | i18n }}</a>
       </div>
     </div>
-    <div class="sub-options">
-      <a routerLink="/hint">{{ "getMasterPasswordHint" | i18n }}</a>
-    </div>
-  </div>
-</form>
+  </form>
+</div>
 <ng-template #environment></ng-template>
diff --git a/src/scss/pages.scss b/src/scss/pages.scss
index 844b61cac0..cb91290e44 100644
--- a/src/scss/pages.scss
+++ b/src/scss/pages.scss
@@ -139,28 +139,6 @@
   }
 }
 
-.login-header {
-  padding: 1em;
-  font-size: 1.2em;
-  .environment-urls-settings-icon {
-    @include themify($themes) {
-      color: themed("mutedColor");
-    }
-
-    span {
-      visibility: hidden;
-    }
-
-    &:hover,
-    &:focus {
-      text-decoration: none;
-
-      @include themify($themes) {
-        color: themed("primaryColor");
-      }
-    }
-  }
-}
 #sso-page {
   .content {
     width: 300px;
@@ -237,3 +215,31 @@
     margin-bottom: 20px;
   }
 }
+
+#login-page {
+  flex-direction: column;
+
+  .login-header {
+    align-self: flex-start;
+    padding: 1em;
+    font-size: 1.2em;
+    .environment-urls-settings-icon {
+      @include themify($themes) {
+        color: themed("mutedColor");
+      }
+
+      span {
+        visibility: hidden;
+      }
+
+      &:hover,
+      &:focus {
+        text-decoration: none;
+
+        @include themify($themes) {
+          color: themed("primaryColor");
+        }
+      }
+    }
+  }
+}