### Eclipse Workspace Patch 1.0
#P drupal
Index: modules/user/user.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user.module,v
retrieving revision 1.755
diff -u -r1.755 user.module
--- modules/user/user.module	11 Feb 2007 09:30:51 -0000	1.755
+++ modules/user/user.module	14 Feb 2007 21:36:13 -0000
@@ -1424,9 +1424,15 @@
   }
   if (user_access('administer access control')) {
     $roles = user_roles(1);
-    unset($roles[DRUPAL_AUTHENTICATED_RID]);
-    if ($roles) {
-      $form['account']['roles'] = array('#type' => 'checkboxes', '#title' => t('Roles'), '#default_value' => array_keys((array)$edit['roles']), '#options' => $roles, '#description' => t('The user receives the combined permissions of the %au role, and all roles selected here.', array('%au' => t('authenticated user'))));
+     if ($roles) {
+      $form['account']['roles'] = array(
+        '#type' => 'checkboxes',
+        '#title' => t('Roles'),
+        '#default_value' => array_merge(array_keys((array)$edit['roles']), array(DRUPAL_AUTHENTICATED_RID)),
+        '#options' => $roles,
+        '#disabled' => array(DRUPAL_AUTHENTICATED_RID),
+        '#description' => t('The user receives the combined permissions of the %au role, and other roles selected here.', array('%au' => t('authenticated user'))),
+      );
     }
   }