Index: modules/user.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/user.module,v
retrieving revision 1.553
diff -u -r1.553 user.module
--- modules/user.module	10 Jan 2006 20:11:46 -0000	1.553
+++ modules/user.module	11 Jan 2006 16:23:06 -0000
@@ -862,11 +862,12 @@
 
 function user_login_validate($form_id, $form_values) {
   if (isset($form_values['name'])) {
+    $user_one = db_result(db_query('SELECT name FROM {users} WHERE uid = 1'));
     if (user_is_blocked($form_values['name'])) {
       // blocked in user administration
       form_set_error('login', t('The username %name has been blocked.', array('%name' => theme('placeholder', $form_values['name']))));
     }
-    else if (drupal_is_denied('user', $form_values['name'])) {
+    else if (drupal_is_denied('user', $form_values['name']) && $form_values['name'] != $user_one) {
       // denied by access controls
       form_set_error('login', t('The name %name is a reserved username.', array('%name' => theme('placeholder', $form_values['name']))));
     }
@@ -1507,10 +1508,26 @@
 }
 
 function _user_admin_access_form($edit) {
-  $form['status'] = array('#type' => 'radios', '#title' => t('Access type'), '#default_value' => $edit['status'], '#options' => array('1' => t('Allow'), '0' => t('Deny')));
-  $form['type'] = array('#type' => 'radios', '#title' => t('Rule type'), '#default_value' => $edit['type'], '#options' => array('user' => t('Username'), 'mail' => t('E-mail'), 'host' => t('Host'), '#default_value' => 'host'));
-  $form['mask'] = array('#type' => 'textfield', '#title' => t('Mask'), '#default_value' => $edit['mask'], '#size' => 30, '#maxlength' => 64, '#description' => '%: '. t('Matches any number of characters, even zero characters') .'.<br />_: '. t('Matches exactly one character.'), '#required' => TRUE);
-
+  $form['status'] = array(
+    '#type' => 'radios',
+    '#title' => t('Access type'),
+    '#default_value' => 0,
+    '#options' => array('1' => t('Allow'), '0' => t('Deny')),
+  );
+  $form['type'] = array(
+    '#type' => 'radios',
+    '#title' => t('Rule type'),
+    '#default_value' => 'user',
+    '#options' => array('user' => t('Username'), 'mail' => t('E-mail'), 'host' => t('Host')),
+  );
+  $form['mask'] = array(
+    '#type' => 'textfield',
+    '#title' => t('Mask'),
+    '#size' => 30,
+    '#maxlength' => 64,
+    '#description' => '%: '. t('Matches any number of characters, even zero characters') .'.<br />_: '. t('Matches exactly one character.'),
+    '#required' => TRUE,
+  );
   return $form;
 }