diff --git a/core/modules/user/user.links.menu.yml b/core/modules/user/user.links.menu.yml
index bceb59b..12f1f0a 100644
--- a/core/modules/user/user.links.menu.yml
+++ b/core/modules/user/user.links.menu.yml
@@ -26,3 +26,16 @@ entity.user.admin_form:
   description: 'Configure default user account settings, including fields, registration requirements, and email messages.'
   weight: -10
   route_name: entity.user.admin_form
+user.admin_permissions:
+  title: 'Permissions'
+  parent: user.admin_index
+  description: 'Configure permissions per module and per role.'
+  weight: -9
+  route_name: user.admin_permissions
+entity.user_role.collection:
+  title: 'Roles'
+  parent: user.admin_index
+  description: 'Create roles and configure their permissions.'
+  weight: -8
+  route_name: entity.user_role.collection
+
diff --git a/core/modules/user/user.links.task.yml b/core/modules/user/user.links.task.yml
index 5b0d164..ce58387 100644
--- a/core/modules/user/user.links.task.yml
+++ b/core/modules/user/user.links.task.yml
@@ -38,14 +38,3 @@ entity.user.collection:
   title: List
   route_name: entity.user.collection
   base_route: entity.user.collection
-
-user.admin_permissions:
-  title: Permissions
-  route_name: user.admin_permissions
-  base_route: entity.user.collection
-
-entity.user_role.collection:
-  title: 'Roles'
-  route_name: entity.user_role.collection
-  base_route: entity.user.collection
-  weight: 10
diff --git a/core/modules/user/user.module b/core/modules/user/user.module
index b865e95..9ea329e 100644
--- a/core/modules/user/user.module
+++ b/core/modules/user/user.module
@@ -87,6 +87,9 @@ function user_help($route_name, RouteMatchInterface $route_match) {
     case 'user.admin_create':
       return '<p>' . t("This web page allows administrators to register new users. Users' email addresses and usernames must be unique.") . '</p>';
 
+    case 'entity.user.collection':
+      return '<p>' . t('For configuration of user accounts, permissions and roles check the <a href=":config-people">People Configuration</a> pages.', [':config-people' => \Drupal::url('user.admin_index')]) . '</p>';
+
     case 'user.admin_permissions':
       return '<p>' . t('Permissions let you control what users can do and see on your site. You can define a specific set of permissions for each role. (See the <a href=":role">Roles</a> page to create a role.) Any permissions granted to the Authenticated user role will be given to any user who is logged in to your site. From the <a href=":settings">Account settings</a> page, you can make any role into an Administrator role for the site, meaning that role will be granted all new permissions automatically. You should be careful to ensure that only trusted users are given this access and level of control of your site.', [':role' => \Drupal::url('entity.user_role.collection'), ':settings' => \Drupal::url('entity.user.admin_form')]) . '</p>';
 
diff --git a/core/modules/user/user.routing.yml b/core/modules/user/user.routing.yml
index 319f219..e54a024 100644
--- a/core/modules/user/user.routing.yml
+++ b/core/modules/user/user.routing.yml
@@ -46,7 +46,7 @@ user.admin_create:
     _permission: 'administer users'
 
 user.admin_permissions:
-  path: '/admin/people/permissions'
+  path: '/admin/config/people/permissions'
   defaults:
     _form: '\Drupal\user\Form\UserPermissionsForm'
     _title: 'Permissions'
@@ -70,7 +70,7 @@ user.multiple_cancel_confirm:
     _permission: 'administer users'
 
 entity.user_role.collection:
-  path: '/admin/people/roles'
+  path: '/admin/config/people/roles'
   defaults:
     _entity_list: 'user_role'
     _title: 'Roles'