diff --git a/core/modules/contact/lib/Drupal/contact/Tests/ContactPersonalTest.php b/core/modules/contact/lib/Drupal/contact/Tests/ContactPersonalTest.php
index f6ae2c3..1356dde 100644
--- a/core/modules/contact/lib/Drupal/contact/Tests/ContactPersonalTest.php
+++ b/core/modules/contact/lib/Drupal/contact/Tests/ContactPersonalTest.php
@@ -54,7 +54,7 @@ function setUp() {
     parent::setUp();
 
     // Create an admin user.
-    $this->admin_user = $this->drupalCreateUser(array('administer contact forms', 'administer users', 'administer user settings'));
+    $this->admin_user = $this->drupalCreateUser(array('administer contact forms', 'administer users', 'administer account settings'));
 
     // Create some normal users with their contact forms enabled by default.
     config('contact.settings')->set('user_default_enabled', 1)->save();
diff --git a/core/modules/contact/lib/Drupal/contact/Tests/ContactSitewideTest.php b/core/modules/contact/lib/Drupal/contact/Tests/ContactSitewideTest.php
index 6a9e681..1e57fb8 100644
--- a/core/modules/contact/lib/Drupal/contact/Tests/ContactSitewideTest.php
+++ b/core/modules/contact/lib/Drupal/contact/Tests/ContactSitewideTest.php
@@ -34,7 +34,7 @@ public static function getInfo() {
    */
   function testSiteWideContact() {
     // Create and login administrative user.
-    $admin_user = $this->drupalCreateUser(array('access site-wide contact form', 'administer contact forms', 'administer user settings'));
+    $admin_user = $this->drupalCreateUser(array('access site-wide contact form', 'administer contact forms', 'administer account settings'));
     $this->drupalLogin($admin_user);
 
     $flood_limit = 3;
diff --git a/core/modules/field_ui/lib/Drupal/field_ui/Tests/AlterTest.php b/core/modules/field_ui/lib/Drupal/field_ui/Tests/AlterTest.php
index f81c07a..c376634 100644
--- a/core/modules/field_ui/lib/Drupal/field_ui/Tests/AlterTest.php
+++ b/core/modules/field_ui/lib/Drupal/field_ui/Tests/AlterTest.php
@@ -37,7 +37,7 @@ function setUp() {
     $this->drupalCreateContentType(array('type' => 'article', 'name' => 'Article'));
 
     // Create test user.
-    $admin_user = $this->drupalCreateUser(array('access content', 'administer content types', 'administer node fields', 'administer user settings', 'administer user fields'));
+    $admin_user = $this->drupalCreateUser(array('access content', 'administer content types', 'administer node fields', 'administer account settings', 'administer user fields'));
 
     $this->drupalLogin($admin_user);
   }
diff --git a/core/modules/field_ui/lib/Drupal/field_ui/Tests/FieldUiTestBase.php b/core/modules/field_ui/lib/Drupal/field_ui/Tests/FieldUiTestBase.php
index e1aadc5..3b4289a 100644
--- a/core/modules/field_ui/lib/Drupal/field_ui/Tests/FieldUiTestBase.php
+++ b/core/modules/field_ui/lib/Drupal/field_ui/Tests/FieldUiTestBase.php
@@ -25,7 +25,7 @@ function setUp() {
     parent::setUp();
 
     // Create test user.
-    $admin_user = $this->drupalCreateUser(array('access content', 'administer content types', 'administer node fields', 'administer node display', 'administer taxonomy', 'administer taxonomy_term fields', 'administer taxonomy_term display', 'administer users', 'administer user settings', 'administer user display'));
+    $admin_user = $this->drupalCreateUser(array('access content', 'administer content types', 'administer node fields', 'administer node display', 'administer taxonomy', 'administer taxonomy_term fields', 'administer taxonomy_term display', 'administer users', 'administer account settings', 'administer user display'));
     $this->drupalLogin($admin_user);
 
     // Create content type, with underscores.
diff --git a/core/modules/user/lib/Drupal/user/Tests/UserAdminTest.php b/core/modules/user/lib/Drupal/user/Tests/UserAdminTest.php
index f922a2b..b5c29a5 100644
--- a/core/modules/user/lib/Drupal/user/Tests/UserAdminTest.php
+++ b/core/modules/user/lib/Drupal/user/Tests/UserAdminTest.php
@@ -105,7 +105,7 @@ function testUserAdmin() {
    */
   function testNotificationEmailAddress() {
     // Test that the Notification E-mail address field is on the config page.
-    $admin_user = $this->drupalCreateUser(array('administer users', 'administer user settings'));
+    $admin_user = $this->drupalCreateUser(array('administer users', 'administer account settings'));
     $this->drupalLogin($admin_user);
     $this->drupalGet('admin/config/people/accounts');
     $this->assertRaw('id="edit-mail-notification-address"', 'Notification E-mail address field exists');
diff --git a/core/modules/user/lib/Drupal/user/Tests/UserPermissionsTest.php b/core/modules/user/lib/Drupal/user/Tests/UserPermissionsTest.php
index fb53b1b..96197b1 100644
--- a/core/modules/user/lib/Drupal/user/Tests/UserPermissionsTest.php
+++ b/core/modules/user/lib/Drupal/user/Tests/UserPermissionsTest.php
@@ -24,7 +24,7 @@ public static function getInfo() {
   function setUp() {
     parent::setUp();
 
-    $this->admin_user = $this->drupalCreateUser(array('administer permissions', 'access user profiles', 'administer site configuration', 'administer modules', 'administer user settings'));
+    $this->admin_user = $this->drupalCreateUser(array('administer permissions', 'access user profiles', 'administer site configuration', 'administer modules', 'administer account settings'));
 
     // Find the new role ID.
     $all_rids = $this->admin_user->roles;
diff --git a/core/modules/user/user.install b/core/modules/user/user.install
index e1b4ff3..9c9b75b 100644
--- a/core/modules/user/user.install
+++ b/core/modules/user/user.install
@@ -1055,7 +1055,7 @@ function user_update_8017() {
 }
 
 /**
- * Grant "administer user settings" to roles with "administer users."
+ * Grant "administer account settings" to roles with "administer users."
  */
 function user_update_8018() {
   $rids = array();
@@ -1068,7 +1068,7 @@ function user_update_8018() {
   foreach ($rids as $rid) {
     $insert->values(array(
       'rid' => $rid,
-      'permission' => 'administer user settings',
+      'permission' => 'administer account settings',
       'module' => 'user'
     ));
   }
diff --git a/core/modules/user/user.module b/core/modules/user/user.module
index 6e5cbbf..5e13bf9 100644
--- a/core/modules/user/user.module
+++ b/core/modules/user/user.module
@@ -542,8 +542,8 @@ function user_permission() {
       'title' => t('Administer users'),
       'restrict access' => TRUE,
     ),
-    'administer user settings' => array(
-      'title' => t('Administer user settings'),
+    'administer account settings' => array(
+      'title' => t('Administer account settings'),
       'restrict access' => TRUE,
     ),
     'access user profiles' => array(
@@ -999,7 +999,7 @@ function user_menu() {
    'position' => 'left',
    'weight' => -20,
    'page callback' => 'system_admin_menu_block_page',
-   'access arguments' => array('administer user settings'),
+   'access arguments' => array('administer account settings'),
    'file' => 'system.admin.inc',
    'file path' => drupal_get_path('module', 'system'),
   );
@@ -1008,7 +1008,7 @@ function user_menu() {
     'description' => 'Configure default behavior of users, including registration requirements, e-mails, and fields.',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('user_admin_settings'),
-    'access arguments' => array('administer user settings'),
+    'access arguments' => array('administer account settings'),
     'file' => 'user.admin.inc',
     'weight' => -10,
   );