diff --git a/core/modules/user/lib/Drupal/user/Tests/UserCreateTest.php b/core/modules/user/lib/Drupal/user/Tests/UserCreateTest.php
index 9e45071..379f6c9 100644
--- a/core/modules/user/lib/Drupal/user/Tests/UserCreateTest.php
+++ b/core/modules/user/lib/Drupal/user/Tests/UserCreateTest.php
@@ -41,11 +41,11 @@ protected function testUserAdd() {
 
     $config->set('password_strength', TRUE)->save();
     $this->drupalGet('admin/people/create');
-    $this->assertRaw(t('Password strength:'), 'The password strength widget is displayed.');
+    $this->assertRaw(t('Password strength:'), 'The password strength indicator is displayed.');
 
     $config->set('password_strength', FALSE)->save();
     $this->drupalGet('admin/people/create');
-    $this->assertNoRaw(t('Password strength:'), 'The password strength widget is not displayed.');
+    $this->assertNoRaw(t('Password strength:'), 'The password strength indicator is not displayed.');
 
     // We create two users, notifying one and not notifying the other, to
     // ensure that the tests work in both cases.
diff --git a/core/modules/user/lib/Drupal/user/Tests/UserEditTest.php b/core/modules/user/lib/Drupal/user/Tests/UserEditTest.php
index f73d78c..178ddda 100644
--- a/core/modules/user/lib/Drupal/user/Tests/UserEditTest.php
+++ b/core/modules/user/lib/Drupal/user/Tests/UserEditTest.php
@@ -83,11 +83,11 @@ function testUserEdit() {
 
     $config->set('password_strength', TRUE)->save();
     $this->drupalPost("user/$user1->uid/edit", $edit, t('Save'));
-    $this->assertRaw(t('Password strength:'), 'The password strength widget is displayed.');
+    $this->assertRaw(t('Password strength:'), 'The password strength indicator is displayed.');
 
     $config->set('password_strength', FALSE)->save();
     $this->drupalPost("user/$user1->uid/edit", $edit, t('Save'));
-    $this->assertNoRaw(t('Password strength:'), 'The password strength widget is not displayed.');
+    $this->assertNoRaw(t('Password strength:'), 'The password strength indicator is not displayed.');
   }
 
   /**
diff --git a/core/modules/user/user.admin.inc b/core/modules/user/user.admin.inc
index 123572d..3ebfe86 100644
--- a/core/modules/user/user.admin.inc
+++ b/core/modules/user/user.admin.inc
@@ -341,15 +341,15 @@ function user_admin_settings($form, &$form_state) {
   }
 
   $form['pass_strength'] = array(
-    '#type' => 'fieldset',
-    '#title' => t('Pass strength check'),
+    '#type' => 'details',
+    '#title' => t('Password strength indicator'),
   );
 
   $form['pass_strength']['user_password_strength'] = array(
     '#type' => 'checkbox',
-    '#title' => t('Enable password strength check'),
+    '#title' => t('Enable password strength indicator'),
     '#default_value' => $config->get('password_strength'),
-    '#description' => t('Enable password strength checking during account creation and modification.')
+    '#description' => t('Display password strength indicator during account creation and modification.')
   );
 
   // User registration settings.