diff --git a/src/modules/whowas.c b/src/modules/whowas.c
index c5149ec07..f70096bbf 100644
--- a/src/modules/whowas.c
+++ b/src/modules/whowas.c
@@ -100,9 +100,7 @@ CMD_FUNC(cmd_whowas)
 		{
 			sendnumeric(client, RPL_WHOWASUSER, temp->name,
 			    temp->username,
-			    (IsOper(client) ? temp->hostname :
-			    (*temp->virthost !=
-			    '\0') ? temp->virthost : temp->hostname),
+			    BadPtr(temp->virthost) ? temp->hostname : temp->virthost,
 			    temp->realname);
 			if (!BadPtr(temp->ip) && ValidatePermissionsForPath("client:see:ip",client,NULL,NULL,NULL))
 			{