diff --git a/app/assets/stylesheets/common/base/login.scss b/app/assets/stylesheets/common/base/login.scss
index d266776929b..022030d4faa 100644
--- a/app/assets/stylesheets/common/base/login.scss
+++ b/app/assets/stylesheets/common/base/login.scss
@@ -144,7 +144,10 @@ $input-width: 220px;
 }
 
 .auth-message {
-  padding: 0 15px 15px 15px
+  padding: 0 15px 15px 15px;
+  &:empty {
+    padding: 0;
+  }
 }
 
 .modal tr.instructions {
@@ -162,4 +165,4 @@ button#login-link, button#new-account-link
 {
   background: transparent;
   color: dark-light-choose($primary-high, $secondary-low);
-}
+}
\ No newline at end of file
diff --git a/app/assets/stylesheets/desktop/login.scss b/app/assets/stylesheets/desktop/login.scss
index 7460ebe0850..a26fd54ffa7 100644
--- a/app/assets/stylesheets/desktop/login.scss
+++ b/app/assets/stylesheets/desktop/login.scss
@@ -1,11 +1,6 @@
-// -webkit- prefix needed for 
-// flexbox on Safari 8
-// can be removed once support
-// for safari 8 is dropped
-
 // shared styles used
 // on both the login and
-// create accont modals
+// create account modals
 .login-modal,
 .create-account {
   #login-buttons:not(.hidden) {
@@ -39,7 +34,6 @@
 
   tr:not(.instructions) {
     td {
-      display: -webkit-flex;
       display: flex;
       padding: 5px 0 0 0;
     }
@@ -60,8 +54,6 @@
     padding: 15px 0;
 
     tr {
-      display: -webkit-flex;
-      -webkit-flex-direction: column;
       display: flex;
       flex-direction: column;
     }
@@ -78,8 +70,6 @@
   }
 
   .create-account-form tr {
-    display: -webkit-flex;
-    -webkit-flex-direction: column;
     display: flex;
     flex-direction: column;
   }
@@ -171,10 +161,6 @@
     margin-bottom: 12px;
   }
 
-  .disclaimer {
-    margin-top: 15px;
-  }
-
   .user-fields {
     border-top: 1px solid $primary-low;
     padding-top: 20px;
diff --git a/app/assets/stylesheets/mobile/login.scss b/app/assets/stylesheets/mobile/login.scss
index fad1aa16457..77e32ca9d81 100644
--- a/app/assets/stylesheets/mobile/login.scss
+++ b/app/assets/stylesheets/mobile/login.scss
@@ -1,8 +1,3 @@
-// -webkit- prefix needed for 
-// flexbox on Safari 8
-// can be removed once support
-// for safari 8 is dropped
-
 // shared styles
 // used in both login and
 // create account modals
@@ -18,7 +13,6 @@
   }
 
   #login-buttons:not(.hidden) {
-    display: -webkit-flex;
     display: flex;
     flex-wrap: wrap;
     justify-content: center;
@@ -32,6 +26,9 @@
       margin: 1% 0 1% 2%;
       font-size: $font-up-1;
       white-space: nowrap;
+      @media screen and (max-width: 360px) {
+        font-size: $font-0;
+      }
     }
 
     + #login-form {
@@ -40,8 +37,6 @@
   }
 
   form {
-    display: -webkit-flex;
-    -webkit-justify-content: center;
     display: flex;
     justify-content: center;
   }
@@ -61,8 +56,6 @@
     }
 
     &:not(.password-confirmation) {
-      display: -webkit-flex;
-      -webkit-flex-direction: column;
       display: flex;
       flex-direction: column;
     }
@@ -104,8 +97,6 @@
   #credentials {
     width: 100%;
     tr {
-      display: -webkit-flex;
-      -webkit-flex-direction: column;
       display: flex;
       flex-direction: column;
     }