diff --git a/src/conf.c b/src/conf.c
index 97ca5053f..c1921b1c5 100644
--- a/src/conf.c
+++ b/src/conf.c
@@ -1746,6 +1746,8 @@ void config_setdefaultsettings(Configuration *i)
 	i->manual_ban_target = BAN_TARGET_HOST;
 
 	i->hide_idle_time = HIDE_IDLE_TIME_OPER_USERMODE;
+
+	i->who_limit = 100;
 }
 
 static void make_default_logblock(void)
diff --git a/src/modules/whox.c b/src/modules/whox.c
index 23767af9d..e59b97e8a 100644
--- a/src/modules/whox.c
+++ b/src/modules/whox.c
@@ -560,7 +560,7 @@ static void who_common_channel(Client *client, Channel *channel,
 static void who_global(Client *client, char *mask, int operspy, struct who_format *fmt)
 {
 	Client *acptr;
-	int maxmatches = WHOLIMIT ? WHOLIMIT : 100;
+	int maxmatches = IsOper(client) ? INT_MAX : WHOLIMIT;
 
 	/* first, list all matching INvisible clients on common channels
 	 * if this is not an operspy who