Index: modules/system/system.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.admin.inc,v
retrieving revision 1.142
diff -u -p -r1.142 system.admin.inc
--- modules/system/system.admin.inc	12 May 2009 08:37:45 -0000	1.142
+++ modules/system/system.admin.inc	12 May 2009 11:31:22 -0000
@@ -1194,13 +1194,6 @@ function system_site_information_setting
     '#default_value' => '',
     '#description' => t('This text will be displayed at the bottom of each page. Useful for adding a copyright notice to your pages.')
   );
-  $form['anonymous'] = array(
-    '#type' => 'textfield',
-    '#title' => t('Anonymous user'),
-    '#default_value' => t('Anonymous'),
-    '#description' => t('The name used to indicate anonymous users.'),
-    '#required' => TRUE,
-  );
   $form['site_frontpage'] = array(
     '#type' => 'textfield',
     '#title' => t('Default front page'),
Index: modules/user/user.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user.admin.inc,v
retrieving revision 1.47
diff -u -p -r1.47 user.admin.inc
--- modules/user/user.admin.inc	12 May 2009 08:37:45 -0000	1.47
+++ modules/user/user.admin.inc	12 May 2009 11:31:23 -0000
@@ -244,10 +244,31 @@ function user_admin_account_validate($fo
  * @see system_settings_form()
  */
 function user_admin_settings() {
-  // User registration settings.
-  $form['registration'] = array('#type' => 'fieldset', '#title' => t('User registration settings'));
-  $form['registration']['user_register'] = array('#type' => 'radios', '#title' => t('Public registrations'), '#default_value' => variable_get('user_register', 1), '#options' => array(t('Only site administrators can create new user accounts.'), t('Visitors can create accounts and no administrator approval is required.'), t('Visitors can create accounts but administrator approval is required.')));
-  $form['registration']['user_email_verification'] = array('#type' => 'checkbox', '#title' => t('Require e-mail verification when a visitor creates an account'), '#default_value' => variable_get('user_email_verification', TRUE), '#description' => t('If this box is checked, new users will be required to validate their e-mail address prior to logging into the site, and will be assigned a system-generated password. With it unchecked, users will be logged in immediately upon registering, and may select their own passwords during registration.'));
+
+  // User identification settings.
+  $form['identification'] = array(
+    '#type' => 'fieldset', 
+    '#title' => t('User identification settings')
+  );
+  $form['identification']['anonymous'] = array(
+    '#type' => 'textfield',
+    '#title' => t('Anonymous user name'),
+    '#default_value' => t('Anonymous'),
+    '#description' => t('The name used to indicate anonymous users.'),
+    '#required' => TRUE,
+  );
+  $form['identification']['user_register'] = array(
+    '#type' => 'radios', 
+    '#title' => t('User registration'), 
+    '#default_value' => variable_get('user_register', 1), 
+    '#options' => array(t('Only site administrators can create new user accounts.'), t('Visitors can create accounts and no administrator approval is required.'), t('Visitors can create accounts but administrator approval is required.'))
+  );
+  $form['identification']['user_email_verification'] = array(
+    '#type' => 'checkbox', 
+    '#title' => t('Require e-mail verification when a visitor creates an account'), 
+    '#default_value' => variable_get('user_email_verification', TRUE), 
+    '#description' => t('If this box is checked, new users will be required to validate their e-mail address prior to logging into the site, and will be assigned a system-generated password. With it unchecked, users will be logged in immediately upon registering, and may select their own passwords during registration.')
+  );
 
   // Account cancellation settings.
   module_load_include('inc', 'user', 'user.pages');
@@ -464,10 +485,10 @@ function user_admin_settings() {
     '#title' => t('Signatures'),
   );
   $form['signatures']['user_signatures'] = array(
-    '#type' => 'radios',
-    '#title' => t('Signature support'),
+    '#type' => 'checkbox',
+    '#title' => t('Enable signature support'),
     '#default_value' => variable_get('user_signatures', 0),
-    '#options' => array(t('Disabled'), t('Enabled')),
+    '#description' => t('Let users specify their signature in their user settings. The signature is usually displayed at the end of posts and comments made by the user.'),
   );
 
   // If picture support is enabled, check whether the picture directory exists:
@@ -482,12 +503,12 @@ function user_admin_settings() {
   );
   $picture_support = variable_get('user_pictures', 0);
   $form['pictures']['user_pictures'] = array(
-    '#type' => 'radios',
-    '#title' => t('Picture support'),
+    '#type' => 'checkbox',
+    '#title' => t('Enable picture support'),
     '#default_value' => $picture_support,
-    '#options' => array(t('Disabled'), t('Enabled')),
-    '#prefix' => '<div class="user-admin-picture-radios">',
+    '#prefix' => '<div class="user-admin-picture-checkbox">',
     '#suffix' => '</div>',
+    '#description' => t('Let users upload a custom picture in their user settings. The picture is usually displayed by the posts and comments made by the user.'),
   );
   drupal_add_js(drupal_get_path('module', 'user') . '/user.js');
   // If JS is enabled, and the radio is defaulting to off, hide all
Index: modules/user/user.js
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user.js,v
retrieving revision 1.13
diff -u -p -r1.13 user.js
--- modules/user/user.js	27 Apr 2009 20:19:38 -0000	1.13
+++ modules/user/user.js	12 May 2009 11:31:23 -0000
@@ -163,12 +163,12 @@ Drupal.evaluatePasswordStrength = functi
 /**
  * On the admin/user/settings page, conditionally show all of the
  * picture-related form elements depending on the current value of the
- * "Picture support" radio buttons.
+ * "Picture support" checkbox.
  */
 Drupal.behaviors.userSettings = {
   attach: function (context, settings) {
-    $('div.user-admin-picture-radios input[type=radio]:not(.userSettings-processed)', context).addClass('userSettings-processed').click(function () {
-      $('div.user-admin-picture-settings', context)[['hide', 'show'][this.value]]();
+    $('div.user-admin-picture-checkbox input[type=checkbox]:not(.userSettings-processed)', context).addClass('userSettings-processed').click(function () {
+      $('div.user-admin-picture-settings', context)[['hide', 'show'][this.checked ? 1 : 0]]();
     });
   }
 };