1 files changed, 6 insertions, 1 deletions
diff --git a/modules/user/user.module b/modules/user/user.module
index 81723ce9a..5b1de2884 100644
--- a/modules/user/user.module
+++ b/modules/user/user.module
@@ -67,7 +67,12 @@ function user_load($array = array()) {
     $user = db_fetch_object($result);
     $user = drupal_unpack($user);
 
-    $user->roles[DRUPAL_AUTHENTICATED_RID] = 'authenticated user';
+    if ($user->uid) {
+      $user->roles[DRUPAL_AUTHENTICATED_RID] = 'authenticated user';
+    }
+    else {
+      $user->roles[DRUPAL_ANONYMOUS_RID] = 'anonymous user';
+    }
     $result = db_query('SELECT r.rid, r.name FROM {role} r INNER JOIN {users_roles} ur ON ur.rid = r.rid WHERE ur.uid = %d', $user->uid);
     while ($role = db_fetch_object($result)) {
       $user->roles[$role->rid] = $role->name;