diff --git a/Changes b/Changes
index bc02966f8..b92892b38 100644
--- a/Changes
+++ b/Changes
@@ -1390,3 +1390,5 @@
   for unknown not being sent as token.
 - Fixed deny link {} blocks being ignored by autoconnect. Reported by a couple people, also
   see #0003084.
+- Fixed a couple of add_Command/del_Command lines in m_chgname and m_helpop trying to
+  add the same token twice. Didn't cause any trouble, normally, though...
diff --git a/src/modules/m_chgname.c b/src/modules/m_chgname.c
index 5b54c5406..db8b204c0 100644
--- a/src/modules/m_chgname.c
+++ b/src/modules/m_chgname.c
@@ -72,7 +72,7 @@ DLLFUNC int MOD_INIT(m_chgname)(ModuleInfo *modinfo)
 	 * We call our add_Command crap here
 	*/
 	add_Command(MSG_CHGNAME, TOK_CHGNAME, m_chgname, 2);
-        add_Command(MSG_SVSNAME, TOK_CHGNAME, m_chgname, 2);
+	add_Command(MSG_SVSNAME, NULL, m_chgname, 2);
 	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
@@ -93,7 +93,7 @@ DLLFUNC int MOD_UNLOAD(m_chgname)(int module_unload)
 		sendto_realops("Failed to delete command chgname when unloading %s",
 				MOD_HEADER(m_chgname).name);
 	}
-	if (del_Command(MSG_SVSNAME, TOK_CHGNAME, m_chgname) < 0)
+	if (del_Command(MSG_SVSNAME, NULL, m_chgname) < 0)
 	{
 		sendto_realops("Failed to delete command svsname when unloading %s",
 				MOD_HEADER(m_chgname).name);
diff --git a/src/modules/m_help.c b/src/modules/m_help.c
index c8e5c2fdf..e4e359967 100644
--- a/src/modules/m_help.c
+++ b/src/modules/m_help.c
@@ -62,7 +62,7 @@ ModuleHeader MOD_HEADER(m_help)
 DLLFUNC int MOD_INIT(m_help)(ModuleInfo *modinfo)
 {
 	add_Command(MSG_HELP, TOK_HELP, m_help, 1);
-	add_Command(MSG_HELPOP, TOK_HELP, m_help, 1);
+	add_Command(MSG_HELPOP, NULL, m_help, 1);
 	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
@@ -79,7 +79,7 @@ DLLFUNC int MOD_UNLOAD(m_help)(int module_unload)
 		sendto_realops("Failed to delete commands when unloading %s",
 			MOD_HEADER(m_help).name);
 	}
-	if (del_Command(MSG_HELPOP, TOK_HELP, m_help) < 0)
+	if (del_Command(MSG_HELPOP, NULL, m_help) < 0)
 	{
 		sendto_realops("Failed to delete commands when unloading %s",
 			MOD_HEADER(m_help).name);