diff --git a/core/modules/user/css/user.module.css b/core/modules/user/css/user.module.css
index f96703e92b8..6d2c51e42eb 100644
--- a/core/modules/user/css/user.module.css
+++ b/core/modules/user/css/user.module.css
@@ -21,7 +21,7 @@
  * Password strength indicator.
  */
 .password-strength {
-  width: 17em;
+  width: 13em;
   float: right;  /* LTR */
 }
 [dir="rtl"] .password-strength {
@@ -51,11 +51,16 @@ input.password-confirm,
 input.password-field {
   width: 13.7em;
   margin-bottom: 0.4em;
+  float: left; /* LTR */
 }
 div.password-confirm {
   float: right;  /* LTR */
   visibility: hidden;
-  width: 17em;
+  width: 13em;
+}
+[dir="rtl"] input.password-confirm,
+[dir="rtl"] input.password-field {
+  float: right;
 }
 [dir="rtl"] div.password-confirm {
   float: left;
@@ -74,6 +79,7 @@ div.password-suggestions ul {
   clear: left; /* LTR */
   margin: 0;
   max-width: 33em;
+  overflow: hidden;
 }
 [dir="rtl"] .confirm-parent,
 [dir="rtl"] .password-parent {
@@ -108,5 +114,6 @@ div.password-suggestions ul {
     clear: none;
     width: 100%;
     max-width: none;
+    overflow: hidden;
   }
 }
diff --git a/core/themes/seven/install-page.css b/core/themes/seven/install-page.css
index 42d3ea24148..76dbee34995 100644
--- a/core/themes/seven/install-page.css
+++ b/core/themes/seven/install-page.css
@@ -174,11 +174,15 @@ body.install-page #page-title {
   float: none;
   width: auto;
 }
-@media all and (max-width: 975px) and (min-width: 48em) {
+@media all and (max-width: 1010px) and (min-width: 48em) {
   .install-page .password-strength,
   .install-page .confirm-parent,
   .install-page div.password-confirm {
     float: none;
     width: auto;
   }
+  input.password-confirm,
+  input.password-field {
+    float: none;
+  }
 }