diff --git a/core/modules/user/css/user.admin.css b/core/modules/user/css/user.admin.css
index ba872d0..10358c2 100644
--- a/core/modules/user/css/user.admin.css
+++ b/core/modules/user/css/user.admin.css
@@ -3,18 +3,20 @@
  * Admin styling for the User module.
  */
 
-#permissions td.module {
+/* Permissions page */
+.permissions .module {
   font-weight: bold;
 }
-#permissions td.permission {
+.permissions .permission {
   padding-left: 1.5em; /* LTR */
 }
-[dir="rtl"] #permissions td.permission {
+[dir="rtl"] .permissions .permission {
   padding-left: 0;
   padding-right: 1.5em;
 }
 
-#user-admin-settings .details-description {
+/* Account settings */
+.user-admin-settings .details-description {
   font-size: 0.85em;
   padding-bottom: .5em;
 }
diff --git a/core/modules/user/css/user.module.css b/core/modules/user/css/user.module.css
index 869d016..2e52c47 100644
--- a/core/modules/user/css/user.module.css
+++ b/core/modules/user/css/user.module.css
@@ -1,4 +1,6 @@
 /**
+ * @file
+ * Basic styling for user module.
  * Password strength indicator.
  */
 .password-strength__title,
@@ -12,27 +14,41 @@
 }
 .password-strength__indicator {
   height: 100%;
-  width: 0%;
+  width: 0;
   background-color: #77b259;
   -webkit-transition: width 0.5s ease-out;
   transition: width 0.5s ease-out;
 }
-input.password-confirm,
-input.password-field,
+.password-strength__indicator.is-weak {
+  background-color: #e62600;
+}
+.password-strength__indicator.is-fair {
+  background-color: #e09600;
+}
+.password-strength__indicator.is-good {
+  background-color: #0074bd;
+}
+.password-strength__indicator.is-strong {
+  background-color: #77b259;
+}
+
+.password-confirm,
+.password-field,
 .password-strength {
   width: 55%;
 }
-div.password-confirm {
+.password-confirm-match {
   visibility: hidden;
   width: 55%;
 }
-div.form-item div.password-suggestions {
+
+.password-suggestions {
   padding: 0.2em 0.5em;
   margin: 0.7em 0;
   max-width: 34.7em;
   border: 1px solid #b4b4b4;
 }
-div.password-suggestions ul {
+.password-suggestions ul {
   margin-bottom: 0;
 }
 .confirm-parent,
@@ -46,15 +62,3 @@ div.password-suggestions ul {
 [dir="rtl"] .password-parent {
   clear: right;
 }
-.password-strength__indicator.is-weak {
-  background-color: #e62600;
-}
-.password-strength__indicator.is-fair {
-  background-color: #e09600;
-}
-.password-strength__indicator.is-good {
-  background-color: #0074bd;
-}
-.password-strength__indicator.is-strong {
-  background-color: #77b259;
-}
diff --git a/core/modules/user/src/Form/UserPermissionsForm.php b/core/modules/user/src/Form/UserPermissionsForm.php
index 9a1df99..4c305f2 100644
--- a/core/modules/user/src/Form/UserPermissionsForm.php
+++ b/core/modules/user/src/Form/UserPermissionsForm.php
@@ -105,6 +105,7 @@ public function buildForm(array $form, FormStateInterface $form_state) {
       '#type' => 'table',
       '#header' => array($this->t('Permission')),
       '#id' => 'permissions',
+      '#attributes' => ['class' => ['permissions']],
       '#sticky' => TRUE,
     );
     foreach ($role_names as $name) {
diff --git a/core/modules/user/user.js b/core/modules/user/user.js
index 51fb591..ded4c0a 100644
--- a/core/modules/user/user.js
+++ b/core/modules/user/user.js
@@ -19,9 +19,9 @@
         innerWrapper.addClass('password-parent');
 
         // Add the password confirmation layer.
-        outerWrapper.find('input.password-confirm').parent().append('<div class="password-confirm">' + translate.confirmTitle + ' <span></span></div>').addClass('confirm-parent');
+        outerWrapper.find('input.password-confirm').parent().append('<div class="password-confirm-match">' + translate.confirmTitle + ' <span></span></div>').addClass('confirm-parent');
         var confirmInput = outerWrapper.find('input.password-confirm');
-        var confirmResult = outerWrapper.find('div.password-confirm');
+        var confirmResult = outerWrapper.find('div.password-confirm-match');
         var confirmChild = confirmResult.find('span');
 
         // If the password strength indicator is enabled, add its markup.
diff --git a/core/themes/seven/css/theme/install-page.css b/core/themes/seven/css/theme/install-page.css
index 3b7cd91..c43b42e 100644
--- a/core/themes/seven/css/theme/install-page.css
+++ b/core/themes/seven/css/theme/install-page.css
@@ -41,11 +41,11 @@
   .install-configure-form .form-type-password {
     width: 100%;
   }
-  input.password-confirm,
-  input.password-field {
+  .password-confirm,
+  .password-field {
     float: none;
   }
-  div.password-confirm {
+  .password-confirm-match {
     float: none;
     width: auto;
     max-width: 100%;