diff --git a/modules/user/user.install b/modules/user/user.install
index 933d813..f7a4a03 100644
--- a/modules/user/user.install
+++ b/modules/user/user.install
@@ -911,16 +911,15 @@ function user_update_7018() {
 }
 
 /**
- * @} End of "addtogroup updates-7.x-extra".
- */
-
-/**
- * Add fallback for new permission.
+ * Add fallback for new 'administer user settings' permission.
  */
 function user_update_7019() {
-  foreach (user_role_permissions(user_roles()) as $rid => $role) {
-    if (isset($role['administer users']) && $role['administer users'] == TRUE) {
-      user_role_grant_permissions($rid, array('administer user settings'));
-    }
+  $user_admin_roles = user_roles(FALSE, 'administer users');
+  foreach (array_keys($user_admin_roles) as $rid => $role) {
+    user_role_grant_permissions($rid, array('administer user settings'));
   }
 }
+
+/**
+ * @} End of "addtogroup updates-7.x-extra".
+ */
diff --git a/modules/user/user.module b/modules/user/user.module
index d1ef690..4fe535b 100644
--- a/modules/user/user.module
+++ b/modules/user/user.module
@@ -884,6 +884,7 @@ function user_permission() {
     'administer user settings' => array(
       'title' => t('Administer user settings'),
       'description' => t('Manage settings that apply to all user accounts.'),
+      'restrict access' => TRUE,
     ),
     'access user profiles' => array(
       'title' => t('View user profiles'),