diff --git a/core/modules/user/tests/src/FunctionalJavascript/PasswordConfirmWidgetTest.php b/core/modules/user/tests/src/FunctionalJavascript/PasswordConfirmWidgetTest.php
new file mode 100644
index 0000000000..def5684e72
--- /dev/null
+++ b/core/modules/user/tests/src/FunctionalJavascript/PasswordConfirmWidgetTest.php
@@ -0,0 +1,149 @@
+<?php
+
+namespace Drupal\Tests\user\FunctionalJavascript;
+
+use Drupal\FunctionalJavascriptTests\WebDriverTestBase;
+
+/**
+ * Tests the JS components added to the PasswordConfirm render element.
+ *
+ * @group user
+ */
+class PasswordConfirmWidgetTest extends WebDriverTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected $defaultTheme = 'stark';
+
+  /**
+   * WebAssert object.
+   *
+   * @var \Drupal\Tests\WebAssert
+   */
+  protected $assert;
+
+  /**
+   * User for testing.
+   *
+   * @var \Drupal\user\UserInterface
+   */
+  protected $testUser;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->assert = $this->assertSession();
+
+    // Create a user.
+    $this->testUser = $this->createUser();
+    $this->drupalLogin($this->testUser);
+  }
+
+  /**
+   * Tests the components added to the password confirm widget.
+   */
+  public function testPasswordConfirmWidgetJsComponents() {
+    $this->drupalGet($this->testUser->toUrl('edit-form'));
+
+    $password_confirm_widget_selector = '.js-form-type-password-confirm.js-form-item-pass';
+    $password_parent_selector = '.js-form-item-pass-pass1';
+    $password_confirm_selector = '.js-form-item-pass-pass2';
+    $password_confirm_widget = $this->assert->elementExists('css', $password_confirm_widget_selector);
+    $password_parent_item = $password_confirm_widget->find('css', $password_parent_selector);
+    $password_confirm_item = $password_confirm_widget->find('css', $password_confirm_selector);
+
+    // Check that 'password-parent' and 'confirm-parent' are added to the
+    // appropriate elements.
+    $this->assertNotNull($this->assert->waitForElement('css', "$password_parent_selector.password-parent"));
+    $this->assertTrue($password_parent_item->hasClass('password-parent'));
+    $this->assertNotNull($this->assert->waitForElement('css', "$password_confirm_selector.confirm-parent"));
+    $this->assertTrue($password_confirm_item->hasClass('confirm-parent'));
+
+    //
+    // Empty widget.
+    //
+    // Check the elements of the main password item.
+    $this->assertTrue($password_parent_item->has('css', 'input.js-password-field'));
+    // Strength meter and bar.
+    $this->assertTrue($password_parent_item->has('css', 'input.js-password-field + .password-strength > .password-strength__meter:first-child .js-password-strength__indicator'));
+    // Password strength feedback. No strength text feedback present without
+    // input.
+    $this->assertTrue($password_parent_item->has('css', '.password-strength > .password-strength__meter + .password-strength__title:last-child > .js-password-strength__text'));
+    $this->assert->elementContains('css', 'input.js-password-field + .password-strength', '<div class="password-strength__meter"><div class="password-strength__indicator js-password-strength__indicator"></div></div><div aria-live="polite" aria-atomic="true" class="password-strength__title">Password strength: <span class="password-strength__text js-password-strength__text"></span></div>');
+
+    // Check the elements of the password confirm item.
+    $this->assertTrue($password_confirm_item->has('css', 'input.js-password-confirm'));
+    // Password match message.
+    $this->assertTrue($password_confirm_item->has('css', 'input.js-password-confirm + .js-password-confirm-message'));
+    $this->assertTrue($password_confirm_item->find('css', 'input.js-password-confirm + .js-password-confirm-message')->isVisible());
+    $this->assert->elementContains('css', "$password_confirm_widget_selector $password_confirm_selector", '<div aria-live="polite" aria-atomic="true" class="password-confirm-message js-password-confirm-message">Passwords match: <span></span></div>');
+
+    // Check the password suggestions element.
+    $this->assertTrue($password_confirm_item->has('css', "$password_confirm_selector + .password-suggestions"));
+    $this->assertFalse($password_confirm_item->has('css', "$password_confirm_selector + .password-suggestions > ul > li"));
+    $this->assertFalse($password_confirm_item->find('css', "$password_confirm_selector + .password-suggestions")->isVisible());
+    $this->assertTrue($password_confirm_item->find('css', "$password_confirm_selector + .password-suggestions")->getHtml() === '');
+
+    //
+    // Fill only the confirm input.
+    //
+    $password_confirm_widget->fillField('Confirm password', 'o');
+    // Password tips should be refreshed and get visible.
+    $this->assertNotNull($this->assert->waitForElement('css', "$password_confirm_selector + .password-suggestions > ul > li"));
+    $this->assertTrue($password_confirm_item->find('css', "$password_confirm_selector + .password-suggestions")->isVisible());
+    // The appropriate strength text should appear.
+    $this->assert->elementContains('css', "$password_confirm_widget_selector $password_parent_selector", '<div aria-live="polite" aria-atomic="true" class="password-strength__title">Password strength: <span class="password-strength__text js-password-strength__text">Weak</span></div>');
+    // Password match.
+    $this->assertTrue($password_confirm_item->find('css', 'input.js-password-confirm + .js-password-confirm-message')->isVisible());
+    $this->assert->elementContains('css', "$password_confirm_widget_selector $password_confirm_selector .js-password-confirm-message", 'Passwords match: <span class="error">no</span>');
+    // Deleting the input should hide the 'password match', but password
+    // strength and tips must remain visible.
+    $password_confirm_widget->fillField('Confirm password', '');
+    $this->assertFalse($password_confirm_item->find('css', 'input.js-password-confirm + .js-password-confirm-message')->isVisible());
+    $this->assert->elementContains('css', "$password_confirm_widget_selector $password_confirm_selector .js-password-confirm-message", 'Passwords match: <span class="error">no</span>');
+    $this->assertTrue($password_confirm_item->find('css', "$password_confirm_selector + .password-suggestions")->isVisible());
+    $this->assertTrue($password_parent_item->find('css', '.password-strength > .password-strength__meter + .password-strength__title')->isVisible());
+    $this->assert->elementContains('css', "$password_confirm_widget_selector $password_parent_selector", '<div aria-live="polite" aria-atomic="true" class="password-strength__title">Password strength: <span class="password-strength__text js-password-strength__text">Weak</span></div>');
+
+    //
+    // Now reload the page, and fill only the main input for first.
+    //
+    $this->drupalGet($this->testUser->toUrl('edit-form'));
+    // Wait for the JS.
+    $this->assert->waitForElement('css', "$password_parent_selector.password-parent");
+    // Fill main input.
+    $password_confirm_widget->fillField('Password', 'o');
+    // Password tips should be refreshed and get visible.
+    $this->assertNotNull($this->assert->waitForElement('css', "$password_confirm_selector + .password-suggestions > ul > li"));
+    $this->assertTrue($password_confirm_item->find('css', "$password_confirm_selector + .password-suggestions > ul > li")->isVisible());
+    // Password match message must become invisible.
+    $this->assertFalse($password_confirm_item->find('css', 'input.js-password-confirm + .js-password-confirm-message')->isVisible());
+    // Password strength message should be updated.
+    $this->assert->elementContains('css', "$password_confirm_widget_selector $password_parent_selector", '<div aria-live="polite" aria-atomic="true" class="password-strength__title">Password strength: <span class="password-strength__text js-password-strength__text">Weak</span></div>');
+    // Deleting the input must not change the element above.
+    $password_confirm_widget->fillField('Password', 'o');
+    $this->assertFalse($password_confirm_item->find('css', 'input.js-password-confirm + .js-password-confirm-message')->isVisible());
+    $this->assertTrue($password_confirm_item->find('css', "$password_confirm_selector + .password-suggestions > ul > li")->isVisible());
+    $this->assert->elementContains('css', "$password_confirm_widget_selector $password_parent_selector", '<div aria-live="polite" aria-atomic="true" class="password-strength__title">Password strength: <span class="password-strength__text js-password-strength__text">Weak</span></div>');
+
+    //
+    // Now fill both the main and confirm input.
+    //
+    $password_confirm_widget->fillField('Password', 'oooooooooO0∘');
+    $password_confirm_widget->fillField('Confirm password', 'oooooooooO0∘');
+    // Bar should be 100% wide.
+    $this->assert->elementAttributeContains('css', 'input.js-password-field + .password-strength > .password-strength__meter .js-password-strength__indicator', 'style', 'width: 100%;');
+    $this->assert->elementContains('css', "$password_confirm_widget_selector $password_parent_selector", '<div aria-live="polite" aria-atomic="true" class="password-strength__title">Password strength: <span class="password-strength__text js-password-strength__text">Strong</span></div>');
+    // Password match message must be visible.
+    $this->assertTrue($password_confirm_item->find('css', 'input.js-password-confirm + .js-password-confirm-message')->isVisible());
+    $this->assert->elementContains('css', "$password_confirm_widget_selector $password_confirm_selector .js-password-confirm-message", 'Passwords match: <span class="ok">yes</span>');
+    // Password suggestions should get invisible, but must contain a single and
+    // empty list item.
+    $this->assertFalse($password_confirm_item->find('css', "$password_confirm_selector + .password-suggestions")->isVisible());
+    $this->assert->elementContains('css', "$password_confirm_selector + .password-suggestions", 'Recommendations to make your password stronger:<ul><li></li></ul>');
+  }
+
+}
diff --git a/core/modules/user/user.es6.js b/core/modules/user/user.es6.js
index d5b8d20060..c0249f4f1b 100644
--- a/core/modules/user/user.es6.js
+++ b/core/modules/user/user.es6.js
@@ -3,7 +3,7 @@
  * User behaviors.
  */
 
-(function($, Drupal, drupalSettings) {
+(($, Drupal) => {
   /**
    * Attach handlers to evaluate the strength of any password fields and to
    * check that its confirmation is correct.
@@ -16,103 +16,189 @@
    */
   Drupal.behaviors.password = {
     attach(context, settings) {
-      const $passwordInput = $(context)
+      $(context)
         .find('input.js-password-field')
-        .once('password');
-
-      if ($passwordInput.length) {
-        const translate = settings.password;
-
-        const $passwordInputParent = $passwordInput.parent();
-        const $passwordInputParentWrapper = $passwordInputParent.parent();
-        let $passwordSuggestions;
-
-        // Add identifying class to password element parent.
-        $passwordInputParent.addClass('password-parent');
-
-        // Add the password confirmation layer.
-        $passwordInputParentWrapper
-          .find('input.js-password-confirm')
-          .parent()
-          .append(Drupal.theme('passwordConfirmMessage', translate))
-          .addClass('confirm-parent');
-
-        const $confirmInput = $passwordInputParentWrapper.find(
-          'input.js-password-confirm',
-        );
-        const $confirmResult = $passwordInputParentWrapper.find(
-          'div.js-password-confirm-message',
-        );
-        const $confirmChild = $confirmResult.find('span');
-
-        // If the password strength indicator is enabled, add its markup.
-        if (settings.password.showStrengthIndicator) {
-          const passwordMeter = `<div class="password-strength"><div class="password-strength__meter"><div class="password-strength__indicator js-password-strength__indicator"></div></div><div aria-live="polite" aria-atomic="true" class="password-strength__title">${translate.strengthTitle} <span class="password-strength__text js-password-strength__text"></span></div></div>`;
-          $confirmInput
+        .once('password')
+        .each(function processPasswordConfirm() {
+          const $mainInput = $(this);
+          const $mainInputParent = $mainInput
             .parent()
-            .after('<div class="password-suggestions description"></div>');
-          $passwordInputParent.append(passwordMeter);
-          $passwordSuggestions = $passwordInputParentWrapper
-            .find('div.password-suggestions')
-            .hide();
-        }
-
-        // Check that password and confirmation inputs match.
-        const passwordCheckMatch = function(confirmInputVal) {
-          const success = $passwordInput.val() === confirmInputVal;
-          const confirmClass = success ? 'ok' : 'error';
-
-          // Fill in the success message and set the class accordingly.
-          $confirmChild
-            .html(translate[`confirm${success ? 'Success' : 'Failure'}`])
-            .removeClass('ok error')
-            .addClass(confirmClass);
-        };
-
-        // Check the password strength.
-        const passwordCheck = function() {
+            .addClass('password-parent');
+          const $passwordWidget = $mainInput.closest(
+            '.js-form-type-password-confirm',
+          );
+          const $confirmInput = $passwordWidget.find(
+            'input.js-password-confirm',
+          );
+          const passwordConfirmMessage = Drupal.theme(
+            'passwordConfirmMessage',
+            settings.password,
+          );
+
+          const $confirmMessage =
+            typeof passwordConfirmMessage === 'string'
+              ? $(passwordConfirmMessage)
+              : passwordConfirmMessage.item;
+          const $confirmTextWrapper =
+            typeof passwordConfirmMessage === 'string'
+              ? $confirmMessage.find('span')
+              : passwordConfirmMessage.textWrapper;
+          const $confirmInputParent = $confirmInput
+            .parent()
+            .addClass('confirm-parent')
+            .append($confirmMessage);
+          const password = {};
+          const passwordStrengthBarClassesToRemove = [
+            settings.password.cssClassPasswordWeak || '',
+            settings.password.cssClassPasswordFair || '',
+            settings.password.cssClassPasswordGood || '',
+            settings.password.cssClassPasswordStrong || '',
+          ]
+            .join(' ')
+            .trim();
+          const confirmTextWrapperClassesToRemove = [
+            settings.password.cssClassPasswordsMatch || '',
+            settings.password.cssClassPasswordsNotMatch || '',
+          ]
+            .join(' ')
+            .trim();
+          const widgetClassesToRemove = [
+            settings.password.cssClassWidgetInitial || '',
+            settings.password.cssClassPasswordEmpty || '',
+            settings.password.cssClassPasswordFilled || '',
+            settings.password.cssClassConfirmEmpty || '',
+            settings.password.cssClassConfirmFilled || '',
+          ]
+            .join(' ')
+            .trim();
+
+          // If the password strength indicator is enabled, add its markup.
           if (settings.password.showStrengthIndicator) {
-            // Evaluate the password strength.
-            const result = Drupal.evaluatePasswordStrength(
-              $passwordInput.val(),
+            const passwordStrength = Drupal.theme(
+              'passwordStrength',
               settings.password,
             );
+            password.$strengthBar = passwordStrength.bar;
+            password.$strengthTextWrapper =
+              passwordStrength.strengthTextWrapper;
+            password.$suggestions = $(
+              Drupal.theme('passwordSuggestions', settings.password, [], false),
+            );
 
-            // Update the suggestions for how to improve the password.
-            if ($passwordSuggestions.html() !== result.message) {
-              $passwordSuggestions.html(result.message);
+            password.$suggestions.hide();
+            $mainInputParent.append(passwordStrength.item);
+            $confirmInputParent.after(password.$suggestions);
+          }
+
+          const addWidgetClasses = () => {
+            $passwordWidget
+              .addClass(
+                $mainInput.val()
+                  ? settings.password.cssClassPasswordFilled
+                  : settings.password.cssClassPasswordEmpty,
+              )
+              .addClass(
+                $confirmInput.val()
+                  ? settings.password.cssClassConfirmFilled
+                  : settings.password.cssClassConfirmEmpty,
+              );
+          };
+
+          // Check that password and confirmation inputs match.
+          const passwordCheckMatch = confirmInputVal => {
+            const passwordsAreMatching = $mainInput.val() === confirmInputVal;
+            const confirmClass = passwordsAreMatching
+              ? settings.password.cssClassPasswordsMatch
+              : settings.password.cssClassPasswordsNotMatch;
+            const confirmMessage = passwordsAreMatching
+              ? settings.password.confirmSuccess
+              : settings.password.confirmFailure;
+
+            // Update the success message and set the class if needed.
+            if (
+              !$confirmTextWrapper.hasClass(confirmClass) ||
+              !$confirmTextWrapper.html() === confirmMessage
+            ) {
+              if (confirmTextWrapperClassesToRemove) {
+                // jQuery.removeClass() removes every CSS class if it's called
+                // without parameter.
+                // Since the strength indicator classes can be empty, we have to
+                // make sure that the classes we want to remove are not empty.
+                // It seems that calling the method with an empty string '' does
+                // keep all the classes, but let's make sure.
+                $confirmTextWrapper.removeClass(
+                  confirmTextWrapperClassesToRemove,
+                );
+              }
+              $confirmTextWrapper.html(confirmMessage).addClass(confirmClass);
             }
+          };
 
-            // Only show the description box if a weakness exists in the
-            // password.
-            $passwordSuggestions.toggle(result.strength !== 100);
-
-            // Adjust the length of the strength indicator.
-            $passwordInputParent
-              .find('.js-password-strength__indicator')
-              .css('width', `${result.strength}%`)
-              .removeClass('is-weak is-fair is-good is-strong')
-              .addClass(result.indicatorClass);
-
-            // Update the strength indication text.
-            $passwordInputParent
-              .find('.js-password-strength__text')
-              .html(result.indicatorText);
-          }
+          // Check the password strength.
+          const passwordCheck = () => {
+            if (settings.password.showStrengthIndicator) {
+              // Evaluate the password strength.
+              const result = Drupal.evaluatePasswordStrength(
+                $mainInput.val(),
+                settings.password,
+              );
+              const $currentPasswordSuggestions = $(
+                Drupal.theme(
+                  'passwordSuggestions',
+                  settings.password,
+                  result.messageTips,
+                ),
+              );
+
+              // Update the suggestions for how to improve the password if needed.
+              if (
+                password.$suggestions.html() !==
+                $currentPasswordSuggestions.html()
+              ) {
+                password.$suggestions.replaceWith($currentPasswordSuggestions);
+                password.$suggestions = $currentPasswordSuggestions.toggle(
+                  // Only show the description box if a weakness exists in the
+                  // password.
+                  result.strength !== 100,
+                );
+              }
+
+              if (passwordStrengthBarClassesToRemove) {
+                password.$strengthBar.removeClass(
+                  passwordStrengthBarClassesToRemove,
+                );
+              }
+              // Adjust the length of the strength indicator.
+              password.$strengthBar
+                .css('width', `${result.strength}%`)
+                .addClass(result.indicatorClass);
+
+              // Update the strength indication text.
+              password.$strengthTextWrapper.html(result.indicatorText);
+            }
+
+            // Check the value in the confirm input and show results.
+            if ($confirmInput.val()) {
+              passwordCheckMatch($confirmInput.val());
+              $confirmMessage.css({ visibility: 'visible' });
+            } else {
+              $confirmMessage.css({ visibility: 'hidden' });
+            }
+
+            if (widgetClassesToRemove) {
+              $passwordWidget.removeClass(widgetClassesToRemove);
+              addWidgetClasses();
+            }
+          };
 
-          // Check the value in the confirm input and show results.
-          if ($confirmInput.val()) {
-            passwordCheckMatch($confirmInput.val());
-            $confirmResult.css({ visibility: 'visible' });
-          } else {
-            $confirmResult.css({ visibility: 'hidden' });
+          if (widgetClassesToRemove) {
+            addWidgetClasses();
           }
-        };
 
-        // Monitor input events.
-        $passwordInput.on('input', passwordCheck);
-        $confirmInput.on('input', passwordCheck);
-      }
+          // Monitor input events.
+          $mainInput.on('input', passwordCheck);
+          $confirmInput.on('input', passwordCheck);
+        });
     },
   };
 
@@ -123,13 +209,14 @@
    *
    * @param {string} password
    *   The password to evaluate.
-   * @param {object} translate
-   *   An object containing the text to display for each strength level.
+   * @param {object} passwordSettings
+   *   A password settings object containing the text to display and the CSS
+   *   classes for each strength level.
    *
    * @return {object}
    *   An object containing strength, message, indicatorText and indicatorClass.
    */
-  Drupal.evaluatePasswordStrength = function(password, translate) {
+  Drupal.evaluatePasswordStrength = (password, passwordSettings) => {
     password = password.trim();
     let indicatorText;
     let indicatorClass;
@@ -146,30 +233,30 @@
     // otherwise use value from the database.
     const $usernameBox = $('input.username');
     const username =
-      $usernameBox.length > 0 ? $usernameBox.val() : translate.username;
+      $usernameBox.length > 0 ? $usernameBox.val() : passwordSettings.username;
 
     // Lose 5 points for every character less than 12, plus a 30 point penalty.
     if (password.length < 12) {
-      msg.push(translate.tooShort);
+      msg.push(passwordSettings.tooShort);
       strength -= (12 - password.length) * 5 + 30;
     }
 
     // Count weaknesses.
     if (!hasLowercase) {
-      msg.push(translate.addLowerCase);
-      weaknesses++;
+      msg.push(passwordSettings.addLowerCase);
+      weaknesses += 1;
     }
     if (!hasUppercase) {
-      msg.push(translate.addUpperCase);
-      weaknesses++;
+      msg.push(passwordSettings.addUpperCase);
+      weaknesses += 1;
     }
     if (!hasNumbers) {
-      msg.push(translate.addNumbers);
-      weaknesses++;
+      msg.push(passwordSettings.addNumbers);
+      weaknesses += 1;
     }
     if (!hasPunctuation) {
-      msg.push(translate.addPunctuation);
-      weaknesses++;
+      msg.push(passwordSettings.addPunctuation);
+      weaknesses += 1;
     }
 
     // Apply penalty for each weakness (balanced against length penalty).
@@ -193,7 +280,7 @@
 
     // Check if password is the same as the username.
     if (password !== '' && password.toLowerCase() === username.toLowerCase()) {
-      msg.push(translate.sameAsUsername);
+      msg.push(passwordSettings.sameAsUsername);
       // Passwords the same as username are always very weak.
       strength = 5;
     }
@@ -201,21 +288,22 @@
     // Based on the strength, work out what text should be shown by the
     // password strength meter.
     if (strength < 60) {
-      indicatorText = translate.weak;
-      indicatorClass = 'is-weak';
+      indicatorText = passwordSettings.weak;
+      indicatorClass = passwordSettings.cssClassPasswordWeak;
     } else if (strength < 70) {
-      indicatorText = translate.fair;
-      indicatorClass = 'is-fair';
+      indicatorText = passwordSettings.fair;
+      indicatorClass = passwordSettings.cssClassPasswordFair;
     } else if (strength < 80) {
-      indicatorText = translate.good;
-      indicatorClass = 'is-good';
+      indicatorText = passwordSettings.good;
+      indicatorClass = passwordSettings.cssClassPasswordGood;
     } else if (strength <= 100) {
-      indicatorText = translate.strong;
-      indicatorClass = 'is-strong';
+      indicatorText = passwordSettings.strong;
+      indicatorClass = passwordSettings.cssClassPasswordStrong;
     }
 
-    // Assemble the final message.
-    msg = `${translate.hasWeaknesses}<ul><li>${msg.join(
+    // Assemble the final message while keeping the original message array.
+    const messageTips = msg;
+    msg = `${passwordSettings.hasWeaknesses}<ul><li>${msg.join(
       '</li><li>',
     )}</li></ul>`;
 
@@ -224,6 +312,7 @@
       message: msg,
       indicatorText,
       indicatorClass,
+      messageTips,
     };
   };
-})(jQuery, Drupal, drupalSettings);
+})(jQuery, Drupal);
diff --git a/core/modules/user/user.js b/core/modules/user/user.js
index b82261f7dd..42e6e83ed0 100644
--- a/core/modules/user/user.js
+++ b/core/modules/user/user.js
@@ -5,67 +5,97 @@
 * @preserve
 **/
 
-(function ($, Drupal, drupalSettings) {
+(function ($, Drupal) {
   Drupal.behaviors.password = {
     attach: function attach(context, settings) {
-      var $passwordInput = $(context).find('input.js-password-field').once('password');
-
-      if ($passwordInput.length) {
-        var translate = settings.password;
-        var $passwordInputParent = $passwordInput.parent();
-        var $passwordInputParentWrapper = $passwordInputParent.parent();
-        var $passwordSuggestions;
-        $passwordInputParent.addClass('password-parent');
-        $passwordInputParentWrapper.find('input.js-password-confirm').parent().append(Drupal.theme('passwordConfirmMessage', translate)).addClass('confirm-parent');
-        var $confirmInput = $passwordInputParentWrapper.find('input.js-password-confirm');
-        var $confirmResult = $passwordInputParentWrapper.find('div.js-password-confirm-message');
-        var $confirmChild = $confirmResult.find('span');
+      $(context).find('input.js-password-field').once('password').each(function processPasswordConfirm() {
+        var $mainInput = $(this);
+        var $mainInputParent = $mainInput.parent().addClass('password-parent');
+        var $passwordWidget = $mainInput.closest('.js-form-type-password-confirm');
+        var $confirmInput = $passwordWidget.find('input.js-password-confirm');
+        var passwordConfirmMessage = Drupal.theme('passwordConfirmMessage', settings.password);
+        var $confirmMessage = typeof passwordConfirmMessage === 'string' ? $(passwordConfirmMessage) : passwordConfirmMessage.item;
+        var $confirmTextWrapper = typeof passwordConfirmMessage === 'string' ? $confirmMessage.find('span') : passwordConfirmMessage.textWrapper;
+        var $confirmInputParent = $confirmInput.parent().addClass('confirm-parent').append($confirmMessage);
+        var password = {};
+        var passwordStrengthBarClassesToRemove = [settings.password.cssClassPasswordWeak || '', settings.password.cssClassPasswordFair || '', settings.password.cssClassPasswordGood || '', settings.password.cssClassPasswordStrong || ''].join(' ').trim();
+        var confirmTextWrapperClassesToRemove = [settings.password.cssClassPasswordsMatch || '', settings.password.cssClassPasswordsNotMatch || ''].join(' ').trim();
+        var widgetClassesToRemove = [settings.password.cssClassWidgetInitial || '', settings.password.cssClassPasswordEmpty || '', settings.password.cssClassPasswordFilled || '', settings.password.cssClassConfirmEmpty || '', settings.password.cssClassConfirmFilled || ''].join(' ').trim();
 
         if (settings.password.showStrengthIndicator) {
-          var passwordMeter = "<div class=\"password-strength\"><div class=\"password-strength__meter\"><div class=\"password-strength__indicator js-password-strength__indicator\"></div></div><div aria-live=\"polite\" aria-atomic=\"true\" class=\"password-strength__title\">".concat(translate.strengthTitle, " <span class=\"password-strength__text js-password-strength__text\"></span></div></div>");
-          $confirmInput.parent().after('<div class="password-suggestions description"></div>');
-          $passwordInputParent.append(passwordMeter);
-          $passwordSuggestions = $passwordInputParentWrapper.find('div.password-suggestions').hide();
+          var passwordStrength = Drupal.theme('passwordStrength', settings.password);
+          password.$strengthBar = passwordStrength.bar;
+          password.$strengthTextWrapper = passwordStrength.strengthTextWrapper;
+          password.$suggestions = $(Drupal.theme('passwordSuggestions', settings.password, [], false));
+          password.$suggestions.hide();
+          $mainInputParent.append(passwordStrength.item);
+          $confirmInputParent.after(password.$suggestions);
         }
 
+        var addWidgetClasses = function addWidgetClasses() {
+          $passwordWidget.addClass($mainInput.val() ? settings.password.cssClassPasswordFilled : settings.password.cssClassPasswordEmpty).addClass($confirmInput.val() ? settings.password.cssClassConfirmFilled : settings.password.cssClassConfirmEmpty);
+        };
+
         var passwordCheckMatch = function passwordCheckMatch(confirmInputVal) {
-          var success = $passwordInput.val() === confirmInputVal;
-          var confirmClass = success ? 'ok' : 'error';
-          $confirmChild.html(translate["confirm".concat(success ? 'Success' : 'Failure')]).removeClass('ok error').addClass(confirmClass);
+          var passwordsAreMatching = $mainInput.val() === confirmInputVal;
+          var confirmClass = passwordsAreMatching ? settings.password.cssClassPasswordsMatch : settings.password.cssClassPasswordsNotMatch;
+          var confirmMessage = passwordsAreMatching ? settings.password.confirmSuccess : settings.password.confirmFailure;
+
+          if (!$confirmTextWrapper.hasClass(confirmClass) || !$confirmTextWrapper.html() === confirmMessage) {
+            if (confirmTextWrapperClassesToRemove) {
+              $confirmTextWrapper.removeClass(confirmTextWrapperClassesToRemove);
+            }
+
+            $confirmTextWrapper.html(confirmMessage).addClass(confirmClass);
+          }
         };
 
         var passwordCheck = function passwordCheck() {
           if (settings.password.showStrengthIndicator) {
-            var result = Drupal.evaluatePasswordStrength($passwordInput.val(), settings.password);
+            var result = Drupal.evaluatePasswordStrength($mainInput.val(), settings.password);
+            var $currentPasswordSuggestions = $(Drupal.theme('passwordSuggestions', settings.password, result.messageTips));
 
-            if ($passwordSuggestions.html() !== result.message) {
-              $passwordSuggestions.html(result.message);
+            if (password.$suggestions.html() !== $currentPasswordSuggestions.html()) {
+              password.$suggestions.replaceWith($currentPasswordSuggestions);
+              password.$suggestions = $currentPasswordSuggestions.toggle(result.strength !== 100);
             }
 
-            $passwordSuggestions.toggle(result.strength !== 100);
-            $passwordInputParent.find('.js-password-strength__indicator').css('width', "".concat(result.strength, "%")).removeClass('is-weak is-fair is-good is-strong').addClass(result.indicatorClass);
-            $passwordInputParent.find('.js-password-strength__text').html(result.indicatorText);
+            if (passwordStrengthBarClassesToRemove) {
+              password.$strengthBar.removeClass(passwordStrengthBarClassesToRemove);
+            }
+
+            password.$strengthBar.css('width', "".concat(result.strength, "%")).addClass(result.indicatorClass);
+            password.$strengthTextWrapper.html(result.indicatorText);
           }
 
           if ($confirmInput.val()) {
             passwordCheckMatch($confirmInput.val());
-            $confirmResult.css({
+            $confirmMessage.css({
               visibility: 'visible'
             });
           } else {
-            $confirmResult.css({
+            $confirmMessage.css({
               visibility: 'hidden'
             });
           }
+
+          if (widgetClassesToRemove) {
+            $passwordWidget.removeClass(widgetClassesToRemove);
+            addWidgetClasses();
+          }
         };
 
-        $passwordInput.on('input', passwordCheck);
+        if (widgetClassesToRemove) {
+          addWidgetClasses();
+        }
+
+        $mainInput.on('input', passwordCheck);
         $confirmInput.on('input', passwordCheck);
-      }
+      });
     }
   };
 
-  Drupal.evaluatePasswordStrength = function (password, translate) {
+  Drupal.evaluatePasswordStrength = function (password, passwordSettings) {
     password = password.trim();
     var indicatorText;
     var indicatorClass;
@@ -77,31 +107,31 @@
     var hasNumbers = /[0-9]/.test(password);
     var hasPunctuation = /[^a-zA-Z0-9]/.test(password);
     var $usernameBox = $('input.username');
-    var username = $usernameBox.length > 0 ? $usernameBox.val() : translate.username;
+    var username = $usernameBox.length > 0 ? $usernameBox.val() : passwordSettings.username;
 
     if (password.length < 12) {
-      msg.push(translate.tooShort);
+      msg.push(passwordSettings.tooShort);
       strength -= (12 - password.length) * 5 + 30;
     }
 
     if (!hasLowercase) {
-      msg.push(translate.addLowerCase);
-      weaknesses++;
+      msg.push(passwordSettings.addLowerCase);
+      weaknesses += 1;
     }
 
     if (!hasUppercase) {
-      msg.push(translate.addUpperCase);
-      weaknesses++;
+      msg.push(passwordSettings.addUpperCase);
+      weaknesses += 1;
     }
 
     if (!hasNumbers) {
-      msg.push(translate.addNumbers);
-      weaknesses++;
+      msg.push(passwordSettings.addNumbers);
+      weaknesses += 1;
     }
 
     if (!hasPunctuation) {
-      msg.push(translate.addPunctuation);
-      weaknesses++;
+      msg.push(passwordSettings.addPunctuation);
+      weaknesses += 1;
     }
 
     switch (weaknesses) {
@@ -123,30 +153,32 @@
     }
 
     if (password !== '' && password.toLowerCase() === username.toLowerCase()) {
-      msg.push(translate.sameAsUsername);
+      msg.push(passwordSettings.sameAsUsername);
       strength = 5;
     }
 
     if (strength < 60) {
-      indicatorText = translate.weak;
-      indicatorClass = 'is-weak';
+      indicatorText = passwordSettings.weak;
+      indicatorClass = passwordSettings.cssClassPasswordWeak;
     } else if (strength < 70) {
-      indicatorText = translate.fair;
-      indicatorClass = 'is-fair';
+      indicatorText = passwordSettings.fair;
+      indicatorClass = passwordSettings.cssClassPasswordFair;
     } else if (strength < 80) {
-      indicatorText = translate.good;
-      indicatorClass = 'is-good';
+      indicatorText = passwordSettings.good;
+      indicatorClass = passwordSettings.cssClassPasswordGood;
     } else if (strength <= 100) {
-      indicatorText = translate.strong;
-      indicatorClass = 'is-strong';
+      indicatorText = passwordSettings.strong;
+      indicatorClass = passwordSettings.cssClassPasswordStrong;
     }
 
-    msg = "".concat(translate.hasWeaknesses, "<ul><li>").concat(msg.join('</li><li>'), "</li></ul>");
+    var messageTips = msg;
+    msg = "".concat(passwordSettings.hasWeaknesses, "<ul><li>").concat(msg.join('</li><li>'), "</li></ul>");
     return {
       strength: strength,
       message: msg,
       indicatorText: indicatorText,
-      indicatorClass: indicatorClass
+      indicatorClass: indicatorClass,
+      messageTips: messageTips
     };
   };
-})(jQuery, Drupal, drupalSettings);
\ No newline at end of file
+})(jQuery, Drupal);
\ No newline at end of file
diff --git a/core/modules/user/user.libraries.yml b/core/modules/user/user.libraries.yml
index 0e6e9533a2..5178013b8b 100644
--- a/core/modules/user/user.libraries.yml
+++ b/core/modules/user/user.libraries.yml
@@ -3,6 +3,19 @@ drupal.user:
   js:
     user.js: {}
     user.theme.js: {}
+  drupalSettings:
+    password:
+      cssClassPasswordsMatch: 'ok'
+      cssClassPasswordsNotMatch: 'error'
+      cssClassPasswordWeak: 'is-weak'
+      cssClassPasswordFair: 'is-fair'
+      cssClassPasswordGood: 'is-good'
+      cssClassPasswordStrong: 'is-strong'
+      cssClassWidgetInitial: false
+      cssClassPasswordEmpty: false
+      cssClassPasswordFilled: false
+      cssClassConfirmEmpty: false
+      cssClassConfirmFilled: false
   css:
     component:
       css/user.module.css: {}
diff --git a/core/modules/user/user.module b/core/modules/user/user.module
index d4021f70f6..32acfb7c96 100644
--- a/core/modules/user/user.module
+++ b/core/modules/user/user.module
@@ -1106,7 +1106,9 @@ function user_form_process_password_confirm($element) {
   }
 
   $element['#attached']['library'][] = 'user/drupal.user';
-  $element['#attached']['drupalSettings']['password'] = $password_settings;
+  foreach ($password_settings as $config_key => $config_value) {
+    $element['#attached']['drupalSettings']['password'][$config_key] = $config_value;
+  }
 
   return $element;
 }
diff --git a/core/modules/user/user.theme.es6.js b/core/modules/user/user.theme.es6.js
index 7178eb8609..8528d7cf47 100644
--- a/core/modules/user/user.theme.es6.js
+++ b/core/modules/user/user.theme.es6.js
@@ -3,13 +3,111 @@
  * Theme elements for user password forms.
  */
 
-(Drupal => {
+(($, Drupal) => {
   /**
-   * Constucts a password confirm message element
+   * Constucts a password confirm message element.
+   *
+   * @param {object} passwordSettings
+   *   An object containing password related settings and translated text to
+   *   display.
+   * @param {string} passwordSettings.confirmTitle
+   *   The translated confirm description that labels the actual confirm text.
+   *
+   * @return {string|object}
+   *   This function has to return a string or an object representing DOM
+   *   objects of the password confirm message.
+   *   - If a string is returned, then it has to contains a <span>, but only
+   *     one. That span will wrap the actual confirm text that can be [yes|no]
+   *     (translated).
+   *   - If an object is returned, then the returned object must have the
+   *     following keys:
+   *     - item: The root jQuery element that contains the whole message,
+   *       including the text wrapper element.
+   *     - textWrapper: The wrapper tag jQuery object that will contain the
+   *       actual confirm text.
+   *     Every other key will be ignored.
+   *     Example:
+   *     Drupal.theme.passwordConfirmMessage = passwordSettings => {
+   *       const confirmMessage = {};
+   *       confirmMessage.item = $(
+   *        `<div aria-live="polite" aria-atomic="true">` +
+   *          `${passwordSettings.confirmTitle}` +
+   *        `</div>`,
+   *       ).append((confirmMessage.textWrapper = $('<span></span>')));
+   *       return confirmMessage;
+   *     };
+   */
+  Drupal.theme.passwordConfirmMessage = passwordSettings =>
+    `<div aria-live="polite" aria-atomic="true" class="password-confirm-message js-password-confirm-message">${passwordSettings.confirmTitle} <span></span></div>`;
+
+  /**
+   * Constucts a password strenght message.
+   *
+   * @param {object} passwordSettings
+   *   An object containing password related settings and translated text to
+   *   display.
+   * @param {string} passwordSettings.strengthTitle
+   *   The title that precedes the strength text.
+   *
+   * @return {object}
+   *   This function has to return an object representing DOM fragments of the
+   *   password strength message with the following keys:
+   *   - item: The root jQuery element that contains the whole message,
+   *     including the elements below.
+   *   - bar: The jQuery object of the password strength bar that's width will
+   *     represent the strength of the typed password.
+   *   - strengthTextWrapper: The jQuery object of the password strength text
+   *     that will contain the actual strength as text.
+   *   Every other key will be ignored.
+   */
+  Drupal.theme.passwordStrength = passwordSettings => {
+    const passwordStrength = {};
+    passwordStrength.item = $('<div class="password-strength"></div>')
+      .append(
+        $('<div class="password-strength__meter"></div>').append(
+          (passwordStrength.bar = $(
+            '<div class="password-strength__indicator js-password-strength__indicator"></div>',
+          )),
+        ),
+      )
+      .append(
+        (passwordStrength.strengthMessage = $(
+          `<div aria-live="polite" aria-atomic="true" class="password-strength__title">${passwordSettings.strengthTitle} </div>`,
+        )).append(
+          (passwordStrength.strengthTextWrapper = $(
+            '<span class="password-strength__text js-password-strength__text"></span>',
+          )),
+        ),
+      );
+    return passwordStrength;
+  };
+
+  /**
+   * Constructs password suggestions tips.
+   *
+   * @param {object} passwordSettings
+   *   An object containing password related settings and translated text to
+   *   display.
+   * @param {string} passwordSettings.hasWeaknesses
+   *   The title that precedes tips.
+   * @param {Array.<string>} tips
+   *   Array containing the tips.
+   * @param {bool} outputEmtpyList
+   *   Defaults to true. If set to true, empty <ul> and <li> will be returned.
    *
    * @return {string}
    *   A string representing a DOM fragment.
    */
-  Drupal.theme.passwordConfirmMessage = translate =>
-    `<div aria-live="polite" aria-atomic="true" class="password-confirm-message js-password-confirm-message">${translate.confirmTitle} <span></span></div>`;
-})(Drupal);
+  Drupal.theme.passwordSuggestions = (
+    passwordSettings,
+    tips,
+    outputEmtpyList = true,
+  ) =>
+    `<div class="password-suggestions">${
+      outputEmtpyList || tips.length > 0
+        ? `${passwordSettings.hasWeaknesses}<ul><li>${tips.join(
+            '</li><li>',
+          )}</li></ul>`
+        : ''
+    }</div>`;
+})(jQuery, Drupal);
diff --git a/core/modules/user/user.theme.js b/core/modules/user/user.theme.js
index 4e00e62319..ac92666c72 100644
--- a/core/modules/user/user.theme.js
+++ b/core/modules/user/user.theme.js
@@ -5,8 +5,19 @@
 * @preserve
 **/
 
-(function (Drupal) {
-  Drupal.theme.passwordConfirmMessage = function (translate) {
-    return "<div aria-live=\"polite\" aria-atomic=\"true\" class=\"password-confirm-message js-password-confirm-message\">".concat(translate.confirmTitle, " <span></span></div>");
+(function ($, Drupal) {
+  Drupal.theme.passwordConfirmMessage = function (passwordSettings) {
+    return "<div aria-live=\"polite\" aria-atomic=\"true\" class=\"password-confirm-message js-password-confirm-message\">".concat(passwordSettings.confirmTitle, " <span></span></div>");
   };
-})(Drupal);
\ No newline at end of file
+
+  Drupal.theme.passwordStrength = function (passwordSettings) {
+    var passwordStrength = {};
+    passwordStrength.item = $('<div class="password-strength"></div>').append($('<div class="password-strength__meter"></div>').append(passwordStrength.bar = $('<div class="password-strength__indicator js-password-strength__indicator"></div>'))).append((passwordStrength.strengthMessage = $("<div aria-live=\"polite\" aria-atomic=\"true\" class=\"password-strength__title\">".concat(passwordSettings.strengthTitle, " </div>"))).append(passwordStrength.strengthTextWrapper = $('<span class="password-strength__text js-password-strength__text"></span>')));
+    return passwordStrength;
+  };
+
+  Drupal.theme.passwordSuggestions = function (passwordSettings, tips) {
+    var outputEmtpyList = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
+    return "<div class=\"password-suggestions\">".concat(outputEmtpyList || tips.length > 0 ? "".concat(passwordSettings.hasWeaknesses, "<ul><li>").concat(tips.join('</li><li>'), "</li></ul>") : '', "</div>");
+  };
+})(jQuery, Drupal);
\ No newline at end of file
diff --git a/core/themes/claro/claro.info.yml b/core/themes/claro/claro.info.yml
index d04bf1df4d..448d24df70 100644
--- a/core/themes/claro/claro.info.yml
+++ b/core/themes/claro/claro.info.yml
@@ -64,6 +64,44 @@ libraries-override:
       component:
         assets/vendor/jquery.ui/themes/base/dialog.css: false
 
+  classy/dialog: claro/claro.drupal.dialog
+
+  classy/base:
+    css:
+      component:
+        css/components/action-links.css: false
+        css/components/breadcrumb.css: false
+        css/components/button.css: false
+        css/components/details.css: false
+        css/components/dropbutton.css: false
+        css/components/form.css: false
+        css/components/tabs.css: false
+        css/components/pager.css: false
+        css/components/tableselect.css: css/components/tableselect.css
+        css/components/tabledrag.css: false
+        css/components/collapse-processed.css: false
+
+  classy/dropbutton:
+    css:
+      component:
+        css/components/dropbutton.css: false
+
+  classy/messages:
+    css:
+      component:
+        css/components/messages.css: false
+
+  classy/progress:
+    css:
+      component:
+        css/components/progress.css: css/components/progress.css
+  # @todo Refactor when https://www.drupal.org/node/2642122 is fixed.
+
+  classy/user:
+    css:
+      component:
+        css/components/user.css: false
+
   user/drupal.user: claro/form.password-confirm
 
   field_ui/drupal.field_ui:
@@ -113,6 +151,8 @@ libraries-extend:
     - claro/drupal.shortcut
   core/drupal.ajax:
     - claro/ajax
+  user/drupal.user:
+    - claro/form.password-confirm
   views/views.module:
     - claro/views
   media/media_embed_ckeditor_theme:
diff --git a/core/themes/claro/claro.libraries.yml b/core/themes/claro/claro.libraries.yml
index b177fda5b7..925b9cc4c0 100644
--- a/core/themes/claro/claro.libraries.yml
+++ b/core/themes/claro/claro.libraries.yml
@@ -225,12 +225,18 @@ form.password-confirm:
     component:
       css/components/form--password-confirm.css: {}
   js:
-    js/user.js: {}
+    js/user.theme.js: {}
+  drupalSettings:
+    password:
+      cssClassPasswordWeak: is-weak
+      cssClassWidgetInitial: is-initial
+      cssClassPasswordEmpty: is-password-empty
+      cssClassPasswordFilled: is-password-filled
+      cssClassConfirmEmpty: is-confirm-empty
+      cssClassConfirmFilled: is-confirm-filled
   dependencies:
-    - core/jquery
-    - core/drupal
-    - core/jquery.once
     - claro/global-styling
+    - stable/drupal.user
 
 views:
   css:
diff --git a/core/themes/claro/css/components/form--password-confirm.css b/core/themes/claro/css/components/form--password-confirm.css
index a356a3a290..95fcd3f062 100644
--- a/core/themes/claro/css/components/form--password-confirm.css
+++ b/core/themes/claro/css/components/form--password-confirm.css
@@ -74,11 +74,12 @@
 }
 
 .password-confirm__confirm {
-  margin-bottom: 0;
+  /* Progress spacing + form item description's top margin. */
+  margin-bottom: 0.875rem;
+  transition: none;
 }
 
 .js .password-confirm__confirm {
-  overflow: hidden;
   max-height: 10rem;
   transition: max-height 0.2s ease-in-out, margin 0.2s ease-in-out;
 }
@@ -96,9 +97,11 @@
 }
 
 .js .is-initial.is-password-empty.is-confirm-empty:not(.form-item--error) .password-confirm__confirm {
-  display: none;
+  overflow: hidden;
   max-height: 0;
   margin-top: 0;
+  margin-bottom: 0;
+  transition: max-height 0s ease-in-out, margin 0s ease-in-out;
 }
 
 /**
diff --git a/core/themes/claro/css/components/form--password-confirm.pcss.css b/core/themes/claro/css/components/form--password-confirm.pcss.css
index 860d474675..d31e7ec415 100644
--- a/core/themes/claro/css/components/form--password-confirm.pcss.css
+++ b/core/themes/claro/css/components/form--password-confirm.pcss.css
@@ -32,11 +32,12 @@
 }
 
 .password-confirm__confirm {
-  margin-bottom: 0;
+  /* Progress spacing + form item description's top margin. */
+  margin-bottom: calc(var(--progress-bar-spacing-size) + (6rem / 16));
+  transition: none;
 }
 
 .js .password-confirm__confirm {
-  overflow: hidden;
   max-height: 10rem;
   transition: max-height var(--speed-transition) ease-in-out, margin var(--speed-transition) ease-in-out;
 }
@@ -53,9 +54,11 @@
 }
 
 .js .is-initial.is-password-empty.is-confirm-empty:not(.form-item--error) .password-confirm__confirm {
-  display: none;
+  overflow: hidden;
   max-height: 0;
   margin-top: 0;
+  margin-bottom: 0;
+  transition: max-height 0s ease-in-out, margin 0s ease-in-out;
 }
 
 /**
diff --git a/core/themes/claro/js/user.es6.js b/core/themes/claro/js/user.es6.js
deleted file mode 100644
index 80229ac52b..0000000000
--- a/core/themes/claro/js/user.es6.js
+++ /dev/null
@@ -1,344 +0,0 @@
-/**
- * @file
- * Overrides Drupal core user.js that provides password strength indicator.
- *
- * @todo remove these overrides after
- *   https://www.drupal.org/project/drupal/issues/3067523 has been resolved.
- */
-
-(($, Drupal) => {
-  /**
-   * This overrides the default Drupal.behaviors.password functionality.
-   *
-   * - Markup has been moved to theme functions so that to enable customizations
-   *   needed for matching Claro's design requirements
-   *   (https://www.drupal.org/project/drupal/issues/3067523).
-   * - Modified classes so that same class names are not being used for different
-   *   elements (https://www.drupal.org/project/drupal/issues/3061265).
-   */
-  Drupal.behaviors.password = {
-    attach(context, settings) {
-      const $passwordInput = $(context)
-        .find('input.js-password-field')
-        .once('password');
-
-      if ($passwordInput.length) {
-        // Settings and translated messages added by
-        // user_form_process_password_confirm().
-        const translate = settings.password;
-
-        // The form element object of the password input.
-        const $passwordInputParent = $passwordInput.parent();
-
-        // The password_confirm form element object.
-        const $passwordWidget = $passwordInput.closest(
-          '.js-form-type-password-confirm',
-        );
-
-        // The password confirm input.
-        const $passwordConfirmInput = $passwordWidget.find(
-          'input.js-password-confirm',
-        );
-
-        // The strength feedback element for the password input.
-        const $passwordInputHelp = $(
-          Drupal.theme.passwordInputHelp(translate.strengthTitle),
-        );
-
-        // The password match feedback for the password confirm input.
-        const $passwordConfirmHelp = $(
-          Drupal.theme.passwordConfirmHelp(translate.confirmTitle),
-        );
-
-        const $passwordInputStrengthBar = $passwordInputHelp.find(
-          '.js-password-strength-bar',
-        );
-        const $passwordInputStrengthMessageWrapper = $passwordInputHelp.find(
-          '.js-password-strength-text',
-        );
-        const $passwordConfirmMatch = $passwordConfirmHelp.find(
-          '.js-password-match-text',
-        );
-        let $passwordSuggestionsTips = $(
-          Drupal.theme.passwordSuggestionsTips('', ''),
-        ).hide();
-
-        // If the password strength indicator is enabled, add its markup.
-        if (settings.password.showStrengthIndicator) {
-          $passwordConfirmInput
-            .after($passwordConfirmHelp)
-            .parent()
-            .after($passwordSuggestionsTips);
-
-          $passwordInputParent.append($passwordInputHelp);
-        }
-
-        // Check that password and confirmation inputs match.
-        const passwordCheckMatch = confirmInputVal => {
-          if (confirmInputVal) {
-            const success = $passwordInput.val() === confirmInputVal;
-            const confirmClass = success ? 'ok' : 'error';
-            const confirmMatchMessage = success
-              ? translate.confirmSuccess
-              : translate.confirmFailure;
-
-            // Update the success message and set the class accordingly if
-            // needed.
-            if (
-              !$passwordConfirmMatch.hasClass(confirmClass) ||
-              !$passwordConfirmMatch.html() === confirmMatchMessage
-            ) {
-              $passwordConfirmMatch
-                .html(confirmMatchMessage)
-                .removeClass('ok error')
-                .addClass(confirmClass);
-            }
-          }
-        };
-
-        // Check the password strength.
-        const passwordCheck = () => {
-          if (settings.password.showStrengthIndicator) {
-            // Evaluate the password strength.
-            const result = Drupal.evaluatePasswordStrength(
-              $passwordInput.val(),
-              settings.password,
-            );
-            const $newSuggestions = $(
-              Drupal.theme.passwordSuggestionsTips(
-                translate.hasWeaknesses,
-                result.tips,
-              ),
-            );
-
-            // Update the suggestions for how to improve the password.
-            if ($newSuggestions.html() !== $passwordSuggestionsTips.html()) {
-              $passwordSuggestionsTips.replaceWith($newSuggestions);
-              $passwordSuggestionsTips = $newSuggestions;
-
-              // Only show the description box if a weakness exists in the
-              // password.
-              $passwordSuggestionsTips.toggle(result.strength !== 100);
-            }
-
-            // Adjust the length of the strength indicator.
-            $passwordInputStrengthBar
-              .css('width', `${result.strength}%`)
-              .removeClass('is-weak is-fair is-good is-strong')
-              .addClass(result.indicatorClass);
-
-            // Update the strength indication text if needed.
-            if (
-              !$passwordInputStrengthMessageWrapper.hasClass(
-                result.indicatorClass,
-              ) ||
-              !$passwordInputStrengthMessageWrapper.html() ===
-                result.indicatorText
-            ) {
-              $passwordInputStrengthMessageWrapper
-                .html(result.indicatorText)
-                .removeClass('is-weak is-fair is-good is-strong')
-                .addClass(result.indicatorClass);
-            }
-          }
-
-          $passwordWidget
-            .removeClass('is-initial')
-            .removeClass('is-password-empty is-password-filled')
-            .removeClass('is-confirm-empty is-confirm-filled');
-
-          // Check the value of the password input and add the proper classes.
-          $passwordWidget.addClass(
-            $passwordInput.val() ? 'is-password-filled' : 'is-password-empty',
-          );
-
-          // Check the value in the confirm input and show results.
-          passwordCheckMatch($passwordConfirmInput.val());
-          $passwordWidget.addClass(
-            $passwordConfirmInput.val()
-              ? 'is-confirm-filled'
-              : 'is-confirm-empty',
-          );
-        };
-
-        // Add initial classes.
-        $passwordWidget
-          .addClass(
-            $passwordInput.val() ? 'is-password-filled' : 'is-password-empty',
-          )
-          .addClass(
-            $passwordConfirmInput.val()
-              ? 'is-confirm-filled'
-              : 'is-confirm-empty',
-          );
-
-        // Monitor input events.
-        $passwordInput.on('input', passwordCheck);
-        $passwordConfirmInput.on('input', passwordCheck);
-      }
-    },
-  };
-
-  /**
-   * Override the default Drupal.evaluatePasswordStrength.
-   *
-   * The default implementation of this function hard codes some markup inside
-   * this function. Rendering markup is now handled by
-   * Drupal.behaviors.password.
-   *
-   * @param {string} password
-   *   Password to evaluate the strength.
-   *
-   * @param {Array.<string>} translate
-   *   Settings and translated messages added by user_form_process_password_confirm().
-   *
-   * @return {Array.<string>}
-   *   Array containing the strength, tips, indicators text and class.
-   */
-  Drupal.evaluatePasswordStrength = (password, translate) => {
-    password = password.trim();
-    let indicatorText;
-    let indicatorClass;
-    let weaknesses = 0;
-    let strength = 100;
-    const tips = [];
-    const hasLowercase = /[a-z]/.test(password);
-    const hasUppercase = /[A-Z]/.test(password);
-    const hasNumbers = /[0-9]/.test(password);
-    const hasPunctuation = /[^a-zA-Z0-9]/.test(password);
-
-    // If there is a username edit box on the page, compare password to that,
-    // otherwise use value from the database.
-    const $usernameBox = $('input.username');
-    const username =
-      $usernameBox.length > 0 ? $usernameBox.val() : translate.username;
-
-    // Lose 5 points for every character less than 12, plus a 30 point penalty.
-    if (password.length < 12) {
-      tips.push(translate.tooShort);
-      strength -= (12 - password.length) * 5 + 30;
-    }
-
-    // Count weaknesses.
-    if (!hasLowercase) {
-      tips.push(translate.addLowerCase);
-      weaknesses += 1;
-    }
-    if (!hasUppercase) {
-      tips.push(translate.addUpperCase);
-      weaknesses += 1;
-    }
-    if (!hasNumbers) {
-      tips.push(translate.addNumbers);
-      weaknesses += 1;
-    }
-    if (!hasPunctuation) {
-      tips.push(translate.addPunctuation);
-      weaknesses += 1;
-    }
-
-    // Apply penalty for each weakness (balanced against length penalty).
-    switch (weaknesses) {
-      case 1:
-        strength -= 12.5;
-        break;
-
-      case 2:
-        strength -= 25;
-        break;
-
-      case 3:
-        strength -= 40;
-        break;
-
-      case 4:
-        strength -= 40;
-        break;
-
-      default:
-        // Default: 0. Nothing to do.
-        break;
-    }
-
-    // Check if password is the same as the username.
-    if (password !== '' && password.toLowerCase() === username.toLowerCase()) {
-      tips.push(translate.sameAsUsername);
-      // Passwords the same as username are always very weak.
-      strength = 5;
-    }
-
-    // Based on the strength, work out what text should be shown by the
-    // password strength meter.
-    if (strength < 60) {
-      indicatorText = translate.weak;
-      indicatorClass = 'is-weak';
-    } else if (strength < 70) {
-      indicatorText = translate.fair;
-      indicatorClass = 'is-fair';
-    } else if (strength < 80) {
-      indicatorText = translate.good;
-      indicatorClass = 'is-good';
-    } else if (strength <= 100) {
-      indicatorText = translate.strong;
-      indicatorClass = 'is-strong';
-    }
-
-    return {
-      strength,
-      tips,
-      indicatorText,
-      indicatorClass,
-    };
-  };
-
-  /**
-   * Password strenght feedback for password confirm's main input.
-   *
-   * @param {string} message
-   *   The prefix text for the strength feedback word.
-   *
-   * @return {string}
-   *   The string representing the DOM fragment.
-   */
-  Drupal.theme.passwordInputHelp = message =>
-    `<div class="password-strength">
-      <div class="password-strength__track">
-        <div class="password-strength__bar js-password-strength-bar"></div>
-      </div>
-      <div aria-live="polite" aria-atomic="true" class="password-strength__title">
-        ${message} <span class="password-strength__text js-password-strength-text"></span>
-      </div>
-    </div>`;
-
-  /**
-   * Password match feedback for password confirm input.
-   *
-   * @param {string} message
-   *   The message that precedes the yes|no text.
-   *
-   * @return {string}
-   *   A string representing the DOM fragment.
-   */
-  Drupal.theme.passwordConfirmHelp = message =>
-    `<div aria-live="polite" aria-atomic="true" class="password-match-message">${message} <span class="password-match-message__text js-password-match-text"></span></div>`;
-
-  /**
-   * Password suggestions tips.
-   *
-   * @param {string} title
-   *   The title that precedes tips.
-   * @param {Array.<string>} tips
-   *   Array containing the tips.
-   *
-   * @return {string}
-   *   A string representing the DOM fragment.
-   */
-  Drupal.theme.passwordSuggestionsTips = (title, tips) =>
-    `<div class="password-suggestions">${
-      tips.length
-        ? `${title}<ul class="password-suggestions__tips"><li class="password-suggestions__tip">${tips.join(
-            '</li><li class="password-suggestions__tip">',
-          )}</li></ul>`
-        : ''
-    }</div>`;
-})(jQuery, Drupal);
diff --git a/core/themes/claro/js/user.theme.es6.js b/core/themes/claro/js/user.theme.es6.js
new file mode 100644
index 0000000000..4d27fc0602
--- /dev/null
+++ b/core/themes/claro/js/user.theme.es6.js
@@ -0,0 +1,95 @@
+/**
+ * @file
+ * Password confirm widget template overrides.
+ */
+
+(($, Drupal) => {
+  /**
+   * Constucts a password confirm message element.
+   *
+   * @param {object} passwordSettings
+   *   An object containing password related settings and translated text to
+   *   display.
+   * @param {string} passwordSettings.confirmTitle
+   *   The translated confirm description that labels the actual confirm text.
+   *
+   * @return {object}
+   *   A jQuery object representing a DOM fragment.
+   */
+  Drupal.theme.passwordConfirmMessage = passwordSettings => {
+    const confirmMessage = {};
+    confirmMessage.item = $(
+      `<div aria-live="polite" aria-atomic="true" class="password-match-message">${passwordSettings.confirmTitle} </div>`,
+    ).append(
+      (confirmMessage.textWrapper = $(
+        '<span class="password-match-message__text"></span>',
+      )),
+    );
+    return confirmMessage;
+  };
+
+  /**
+   * Constucts a password strenght message.
+   *
+   * @param {object} passwordSettings
+   *   An object containing password related settings and translated text to
+   *   display.
+   * @param {string} passwordSettings.strengthTitle
+   *   The title that precedes the strength text.
+   *
+   * @return {object}
+   *   A jQuery object representing a DOM fragment.
+   */
+  Drupal.theme.passwordStrength = passwordSettings => {
+    const passwordStrength = {};
+    passwordStrength.item = $('<div class="password-strength"></div>')
+      .append(
+        $('<div class="password-strength__track"></div>').append(
+          (passwordStrength.bar = $(
+            '<div class="password-strength__bar"></div>',
+          )),
+        ),
+      )
+      .append(
+        (passwordStrength.strengthMessage = $(
+          `<div aria-live="polite" aria-atomic="true" class="password-strength__title">${passwordSettings.strengthTitle} </div>`,
+        )).append(
+          (passwordStrength.strengthTextWrapper = $(
+            '<span class="password-strength__text"></span>',
+          )),
+        ),
+      );
+    return passwordStrength;
+  };
+
+  /**
+   * Constructs password suggestions tips.
+   *
+   * @param {object} passwordSettings
+   *   An object containing password related settings and translated text to
+   *   display.
+   * @param {string} passwordSettings.hasWeaknesses
+   *   The title that precedes tips.
+   * @param {Array.<string>} tips
+   *   Array containing the tips.
+   * @param {bool} outputEmtpyList
+   *   Defaults to true. If set to true, empty <ul> and <li> will be returned.
+   *
+   * @return {string}
+   *   A string representing a DOM fragment.
+   */
+  Drupal.theme.passwordSuggestions = (
+    passwordSettings,
+    tips,
+    outputEmtpyList = true,
+  ) =>
+    `<div class="password-suggestions">${
+      tips.length
+        ? `${
+            passwordSettings.hasWeaknesses
+          }<ul class="password-suggestions__tips"><li class="password-suggestions__tip">${tips.join(
+            '</li><li class="password-suggestions__tip">',
+          )}</li></ul>`
+        : ''
+    }</div>`;
+})(jQuery, Drupal);
diff --git a/core/themes/claro/js/user.theme.js b/core/themes/claro/js/user.theme.js
new file mode 100644
index 0000000000..417e62856d
--- /dev/null
+++ b/core/themes/claro/js/user.theme.js
@@ -0,0 +1,25 @@
+/**
+* DO NOT EDIT THIS FILE.
+* See the following change record for more information,
+* https://www.drupal.org/node/2815083
+* @preserve
+**/
+
+(function ($, Drupal) {
+  Drupal.theme.passwordConfirmMessage = function (passwordSettings) {
+    var confirmMessage = {};
+    confirmMessage.item = $("<div aria-live=\"polite\" aria-atomic=\"true\" class=\"password-match-message\">".concat(passwordSettings.confirmTitle, " </div>")).append(confirmMessage.textWrapper = $('<span class="password-match-message__text"></span>'));
+    return confirmMessage;
+  };
+
+  Drupal.theme.passwordStrength = function (passwordSettings) {
+    var passwordStrength = {};
+    passwordStrength.item = $('<div class="password-strength"></div>').append($('<div class="password-strength__track"></div>').append(passwordStrength.bar = $('<div class="password-strength__bar"></div>'))).append((passwordStrength.strengthMessage = $("<div aria-live=\"polite\" aria-atomic=\"true\" class=\"password-strength__title\">".concat(passwordSettings.strengthTitle, " </div>"))).append(passwordStrength.strengthTextWrapper = $('<span class="password-strength__text"></span>')));
+    return passwordStrength;
+  };
+
+  Drupal.theme.passwordSuggestions = function (passwordSettings, tips) {
+    var outputEmtpyList = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
+    return "<div class=\"password-suggestions\">".concat(tips.length ? "".concat(passwordSettings.hasWeaknesses, "<ul class=\"password-suggestions__tips\"><li class=\"password-suggestions__tip\">").concat(tips.join('</li><li class="password-suggestions__tip">'), "</li></ul>") : '', "</div>");
+  };
+})(jQuery, Drupal);
\ No newline at end of file
diff --git a/sites/default/default.services.yml b/sites/default/default.services.yml
old mode 100644
new mode 100755
diff --git a/sites/default/default.settings.php b/sites/default/default.settings.php
old mode 100644
new mode 100755
