diff --git a/src/ngircd/client.c b/src/ngircd/client.c
index d038fd24..83c80f84 100644
--- a/src/ngircd/client.c
+++ b/src/ngircd/client.c
@@ -1192,6 +1192,10 @@ Client_RegisterWhowas( CLIENT *Client )
 
 	assert( Client != NULL );
 
+	/* Don't register WHOWAS information when "MorePrivacy" is enabled. */
+	if (Conf_MorePrivacy)
+		return;
+
 	now = time(NULL);
 	/* Don't register clients that were connected less than 30 seconds. */
 	if( now - Client->starttime < 30 )