diff --git a/src/modules/join.c b/src/modules/join.c
index 3da22183a..6425012a3 100644
--- a/src/modules/join.c
+++ b/src/modules/join.c
@@ -270,7 +270,7 @@ void _join_channel(Channel *channel, Client *client, MessageTag *recv_mtags, con
 		parv[0] = NULL;
 		parv[1] = channel->name;
 		parv[2] = NULL;
-		if (!HasCapability(client,"draft/no-implicit-names") && !HasCapability(client, "no-implicit-names"))
+		if (!HasCapability(client,"draft/no-implicit-names") /* && !HasCapability(client, "no-implicit-names") */)
 			do_cmd(client, NULL, "NAMES", 2, parv);;
 
 		unreal_log(ULOG_INFO, "join", "LOCAL_CLIENT_JOIN", client,
diff --git a/src/modules/no-implicit-names.c b/src/modules/no-implicit-names.c
index fb4f44b65..c0175617c 100644
--- a/src/modules/no-implicit-names.c
+++ b/src/modules/no-implicit-names.c
@@ -48,7 +48,11 @@ MOD_INIT()
 		return MOD_FAILED;
 	}
 
-	/** This is for the future :D */
+	/** This is for the future :D
+	 * If you add this, then also update
+	 * _join_channel in src/modules/join.c to check for it,
+	 * as it is currently commented out there as well.
+	 */
 	/**
 	memset(&cap, 0, sizeof(cap));
 	cap.name = NO_IMPLICIT_NAMES_CAP;