diff --git a/core/modules/user/css/user.admin.css b/core/modules/user/css/user.admin.css
index ba872d0..22a3bf4 100644
--- a/core/modules/user/css/user.admin.css
+++ b/core/modules/user/css/user.admin.css
@@ -3,18 +3,14 @@
  * 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 {
-  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..2cb2bce 100644
--- a/core/modules/user/css/user.module.css
+++ b/core/modules/user/css/user.module.css
@@ -1,5 +1,6 @@
 /**
- * Password strength indicator.
+ * @file
+ * Basic styling for user module.
  */
 .password-strength__title,
 .password-strength__text {
@@ -12,27 +13,30 @@
 }
 .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-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,
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..264c4fb 100644
--- a/core/themes/seven/css/theme/install-page.css
+++ b/core/themes/seven/css/theme/install-page.css
@@ -45,7 +45,7 @@
   input.password-field {
     float: none;
   }
-  div.password-confirm {
+  div.password-confirm-match {
     float: none;
     width: auto;
     max-width: 100%;