diff --git a/plugins/basecommands/who.sp b/plugins/basecommands/who.sp
index 699528e1..69e60579 100644
--- a/plugins/basecommands/who.sp
+++ b/plugins/basecommands/who.sp
@@ -4,7 +4,7 @@
  * SourceMod Basecommands Plugin
  * Provides sm_who functionality
  *
- * SourceMod (C)2004-2007 AlliedModders LLC.  All rights reserved.
+ * SourceMod (C)2004-2008 AlliedModders LLC.  All rights reserved.
  * =============================================================================
  *
  * This program is free software; you can redistribute it and/or modify it under
@@ -28,7 +28,7 @@
  * exceptions, found in LICENSE.txt (as of this writing, version JULY-31-2007),
  * or <http://www.sourcemod.net/license.php>.
  *
- * Version: $Id: admin-flatfile.sp 1438 2007-09-16 03:45:06Z dvander $
+ * Version: $Id$
  */
  
 PerformWho(client, target, ReplySource:reply, bool:is_admin)
@@ -166,7 +166,7 @@ public Action:Command_Who(client, args)
 {
 	new bool:is_admin = false;
 	
-	if (client && GetUserFlagBits(client) != 0)
+	if (!client || (client && GetUserFlagBits(client) != 0))
 	{
 		is_admin = true;
 	}