diff --git a/app/assets/stylesheets/fae/globals/imports/_variables.scss b/app/assets/stylesheets/fae/globals/imports/_variables.scss
index e8c405a63..59d2f3f29 100644
--- a/app/assets/stylesheets/fae/globals/imports/_variables.scss
+++ b/app/assets/stylesheets/fae/globals/imports/_variables.scss
@@ -10,7 +10,7 @@ $fae-breakpoints: (
   // @depreciation - remove page_header_save_block in v2.0
   'page_header_save_block': ( max-width:  615px ),
   'login_container':        ( min-width: 700px ),
-  'login_submit':           ( min-width: 475px ),
+  'login_submit':           ( min-width: 500px ),
 );
 
 // Merge $custom-breakpoints, $fae-breakpoints, and Frob Core's $fine-breakpoints to one variable to use with bp() mixin
diff --git a/app/assets/stylesheets/fae/modules/forms/_label.scss b/app/assets/stylesheets/fae/modules/forms/_label.scss
index dfe3da284..3da8bc0df 100644
--- a/app/assets/stylesheets/fae/modules/forms/_label.scss
+++ b/app/assets/stylesheets/fae/modules/forms/_label.scss
@@ -25,6 +25,10 @@ label {
     .label_inner {
       flex-shrink: 0;
       max-width: 50%;
+
+      .login-form & {
+        max-width: none;
+      }
     }
 
     h6 {
diff --git a/app/assets/stylesheets/fae/pages/_login.scss b/app/assets/stylesheets/fae/pages/_login.scss
index b266af307..747cdbd27 100644
--- a/app/assets/stylesheets/fae/pages/_login.scss
+++ b/app/assets/stylesheets/fae/pages/_login.scss
@@ -47,15 +47,6 @@
     width: 100%;
     min-width: 100%;
   }
-
-  input[type=submit] {
-    margin-top: 20px;
-
-    @include bp(login_submit) {
-      float: right;
-      margin: 0;
-    }
-  }
 }
 
 .login-logo {
@@ -76,31 +67,30 @@
     width: 50%;
   }
 }
-.login-form-actions {
 
+.login-form-actions {
   @include clearfix;
+
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
   padding-bottom: 20px;
+  padding-top: 20px;
 
   @include bp(login_container) {
     padding: 0;
   }
 
-  .boolean {
-    margin: 12px 0 0 0;
+  @include bp(login_submit) {
+    padding-top: 0;
   }
 
-  a {
-    display: inline-block;
-    padding-top: 15px;
-    font-size: 13px;
+  > * {
+    margin-bottom: 20px;
   }
-}
 
-input {
-  &.login-form-actions-submit[type="submit"] {
-    @include bp(login_submit) {
-      margin-top: -27px;
-    }
+  > .input.boolean {
+    flex-grow: 1;
   }
 }
 
@@ -128,6 +118,10 @@ input {
       margin-bottom: 15px;
     }
   }
+
+  input[type=submit] {
+    margin-right: 20px;
+  }
 }
 
 .first_user-form {