diff --git a/app/assets/stylesheets/desktop/login.scss b/app/assets/stylesheets/desktop/login.scss
index 09b512beae2..5bcb612ec7a 100644
--- a/app/assets/stylesheets/desktop/login.scss
+++ b/app/assets/stylesheets/desktop/login.scss
@@ -53,9 +53,23 @@
       padding: 5px 0 0 0;
     }
   }
-
-  tr.input label {
+  .tip,
+  td label {
+    display: block;
+    overflow: hidden;
+    word-wrap: break-word;
     margin-bottom: 0;
+    max-width: 280px;
+    @media screen and (min-width: 500px) {
+      max-width: 400px;
+    }
+  }
+}
+
+.has-alt-auth {
+  .tip,
+  td label {
+    max-width: 250px;
   }
 }
 
@@ -129,7 +143,6 @@
       padding: 15px;
       margin-bottom: 5px;
       max-height: 475px;
-      max-width: 350px;
       @media screen and (max-height: 768px) {
         max-height: 60vh;
       }
@@ -220,9 +233,10 @@
     }
     &:not(:empty),
     &:empty + td {
-      display: block;
       min-height: 1.75em;
-      max-width: 240px;
+      &.bad .svg-icon {
+        vertical-align: middle;
+      }
     }
   }
 }
diff --git a/app/assets/stylesheets/mobile/login.scss b/app/assets/stylesheets/mobile/login.scss
index b8930a44dcd..47efeb46bf1 100644
--- a/app/assets/stylesheets/mobile/login.scss
+++ b/app/assets/stylesheets/mobile/login.scss
@@ -50,6 +50,13 @@
       margin-top: 0.75em;
     }
 
+    td label {
+      max-width: 280px;
+      display: block;
+      overflow: hidden;
+      word-wrap: break-word;
+    }
+
     &:not(.instructions) td {
       padding: 2px 0 0 0;
     }