diff --git a/Changes b/Changes
index 84b35ae37..ac45eb99f 100644
--- a/Changes
+++ b/Changes
@@ -679,3 +679,7 @@ Applied weird sts patch for dynamic allocation of nick
 field in topics
 --Luke
 ===================================
+
+Fixed broken /who
+--Luke
+===================================
diff --git a/src/s_user.c b/src/s_user.c
index 1f2515aa0..95459c0ad 100644
--- a/src/s_user.c
+++ b/src/s_user.c
@@ -2511,7 +2511,20 @@ static void do_who(sptr, acptr, repchan)
                     !ShowChannel(sptr,repchan))
                         status[i++] = '!';
 #endif
-
+	else
+#ifdef ENABLE_INVISOPER
+		if (channelwho && IsHiding(acptr) && IsNetAdmin(sptr) ||
+                    IsInvisible(acptr) && !IsMember(sptr,repchan) ||
+                    IsAuditorium(repchan) && !is_chan_op(acptr,repchan) ||
+                    !ShowChannel(sptr,repchan))
+			return;
+#else
+		if (
+		    IsInvisible(acptr) && !IsMember(sptr,repchan) ||
+                    IsAuditorium(repchan) && !is_chan_op(acptr,repchan) ||
+                    !ShowChannel(sptr,repchan))
+                    	return;
+#endif
 	
 	/* Channel owner */
 /*	if (repchan && is_chanowner(acptr, repchan))