diff --git autoassignrole.admin.inc autoassignrole.admin.inc
index 4603285..afdd374 100644
--- autoassignrole.admin.inc
+++ autoassignrole.admin.inc
@@ -6,28 +6,6 @@
  * Administrative functionality for auto assign role.
  */
 
-
-/**
- * Provide a single block from the administration menu as a page.
- * This function is often a destination for these blocks.
- * For example, 'admin/structure/types' needs to have a destination to be valid
- * in the Drupal menu system, but too much information there might be
- * hidden, so we supply the contents of the block.
- *
- * @return
- *   The output HTML.
- */
-function autoassignrole_admin_block_page() {
-  $item = menu_get_item();
-  if ($content = system_admin_menu_block($item)) {
-    $output = theme('admin_block_content', array('content' => $content));
-  }
-  else {
-    $output = t('You do not have any administrative items.');
-  }
-  return $output;
-}
-
 /**
  * Form builder; The settings form for automatic role assignment.
  *
diff --git autoassignrole.info autoassignrole.info
index 3e2ee8e..a386816 100644
--- autoassignrole.info
+++ autoassignrole.info
@@ -1,7 +1,7 @@
 name = Auto Assign Role
 description = Automatically assign a role to new users.
 core = 7.x
-configure=admin/config/autoassignrole
+configure = admin/config/people/autoassignrole
 version = VERSION
 files[] = autoassignrole.module
 files[] = autoassignrole.admin.inc
diff --git autoassignrole.module autoassignrole.module
index ae61bb5..47da75c 100644
--- autoassignrole.module
+++ autoassignrole.module
@@ -22,36 +22,44 @@
 }
 
 /**
+ * Implements hook_help().
+ */
+function autoassignrole_help($path, $arg) {
+  switch ($path) {
+  	case 'admin/config/people/autoassignrole':
+    	return '<p>' . t('Configure which role(s) are automatically assigned on user creation.') . '</p>';
+  	case 'admin/config/people/autoassignrole/user':
+    	return '<p>' . t('Configure the ability for an end user to choose their own roles.') . '</p>';
+  }
+}
+
+/**
  * Implements hook_menu().
  *
  * @return array
  */
 function autoassignrole_menu() {
   $items = array();
-  $items['admin/config/autoassignrole'] = array(
-    'title' => 'Auto assign role',
-    'description' => 'Configure auto role assignment.',
-    'access arguments' => array('administer autoassignrole'),
-    'page callback' => 'autoassignrole_admin_block_page',
-    'file' => 'autoassignrole.admin.inc',
-  );
-  $items['admin/config/autoassignrole/auto'] = array(
+  $items['admin/config/people/autoassignrole'] = array(
     'title' => 'Auto role assignment',
-    'description' => 'Configure which role(s) are automatically assigned on user creation.',
+    'description' => 'Configure automatical role assignment and self role assignment by users.',
     'access arguments' => array('administer autoassignrole'),
     'page callback' => 'drupal_get_form',
     'page arguments' => array('autoassignrole_auto_settings'),
     'file' => 'autoassignrole.admin.inc',
   );
-  $items['admin/config/autoassignrole/user'] = array(
-    'title' => 'Allow user to choose',
-    'description' => 'Configure the ability for an end user to choose their own roles.',
+  $items['admin/config/people/autoassignrole/auto'] = array(
+    'title' => 'Auto role assignment',
+    'type' => MENU_DEFAULT_LOCAL_TASK,
+  );
+  $items['admin/config/people/autoassignrole/user'] = array(
+    'title' => 'Self role assignment',
     'access arguments' => array('administer autoassignrole'),
     'page callback' => 'drupal_get_form',
     'page arguments' => array('autoassignrole_user_settings'),
+    'type' => MENU_LOCAL_TASK,
     'file' => 'autoassignrole.admin.inc',
   );
-
   return $items;
 }