diff --git a/include/class.user.php b/include/class.user.php
index 92b78838f4f19b26ecb89fe8a426f66c10810609..f930379b8bc940b213975d32de8f7054f2aee0e4 100644
--- a/include/class.user.php
+++ b/include/class.user.php
@@ -873,15 +873,14 @@ class UserAccountStatus {
 
     function __toString() {
 
-        if (!$this->flag)
-            return 'Guest';
-
         if ($this->isLocked())
             return 'Locked (Administrative)';
 
         if (!$this->isConfirmed())
             return 'Locked (Pending Activation)';
 
+        // ... Other flags here (password reset, etc).
+
         return 'Active (Registered)';
     }
 }
diff --git a/include/staff/users.inc.php b/include/staff/users.inc.php
index 4bc597c15c4d2c8369d377d7ea343e9f1e2d4875..0439698f0863368fea95201d82cc424b9948a9a0 100644
--- a/include/staff/users.inc.php
+++ b/include/staff/users.inc.php
@@ -3,7 +3,7 @@ if(!defined('OSTSCPINC') || !$thisstaff) die('Access Denied');
 
 $qstr='';
 
-$select = 'SELECT user.*, email.address as email, account.status ';
+$select = 'SELECT user.*, email.address as email, account.id as account_id, account.status ';
 
 $from = 'FROM '.USER_TABLE.' user '
       . 'LEFT JOIN '.USER_EMAIL_TABLE.' email ON (user.id = email.user_id) '
@@ -114,7 +114,7 @@ else
             while ($row = db_fetch_array($res)) {
                 $name = new PersonsName($row['name']);
                 // Account status
-                if ($row['status'])
+                if ($row['account_id'])
                     $status = new UserAccountStatus($row['status']);
                 else
                     $status = 'Guest';