Index: modules/user/user.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user.module,v
retrieving revision 1.875
diff -u -r1.875 user.module
--- modules/user/user.module	17 Dec 2007 13:46:36 -0000	1.875
+++ modules/user/user.module	18 Dec 2007 17:20:15 -0000
@@ -1241,13 +1241,20 @@
  */
 function user_login_name_validate($form, &$form_state) {
   if (isset($form_state['values']['name'])) {
-    if (user_is_blocked($form_state['values']['name'])) {
+    $name = $form_state['values']['name'];
+    if (user_is_blocked($name)) {
       // blocked in user administration
-      form_set_error('name', t('The username %name has not been activated or is blocked.', array('%name' => $form_state['values']['name'])));
+      form_set_error('name', t('The username %name has not been activated or is blocked.', array('%name' => $name)));
     }
-    else if (drupal_is_denied('user', $form_state['values']['name'])) {
-      // denied by access controls
-      form_set_error('name', t('The name %name is a reserved username.', array('%name' => $form_state['values']['name'])));
+    else if (drupal_is_denied('user', $name)) {
+      $user_one = db_result(db_query('SELECT name FROM {users} WHERE uid = 1'));
+      if ($name == $user_one) {
+        drupal_set_message(t('An access rule tried to block %name.', array('%name' => $name) ), 'warning');
+      }
+      else {
+        // denied by access controls
+        form_set_error('name', t('The name %name is a reserved username.', array('%name' => $name)));
+      }
     }
   }
 }