diff --git a/src/modules/m_nick.c b/src/modules/m_nick.c
index abee198ab..c913d5055 100644
--- a/src/modules/m_nick.c
+++ b/src/modules/m_nick.c
@@ -1213,9 +1213,8 @@ int _register_user(aClient *cptr, aClient *sptr, char *nick, char *username, cha
 				}
 			}
 			if (do_identify)
-				sendto_one(nsptr, ":%s %s %s@%s :IDENTIFY %s",
+				sendto_one(nsptr, ":%s PRIVMSG %s@%s :IDENTIFY %s",
 				    sptr->name,
-				    (IsToken(nsptr->from) ? TOK_PRIVATE : MSG_PRIVATE),
 				    NickServ, SERVICES_NAME, sptr->passwd);
 		}
 		if (buf[0] != '\0' && buf[1] != '\0')
diff --git a/src/modules/m_pingpong.c b/src/modules/m_pingpong.c
index aa21ea078..ef9d4b754 100644
--- a/src/modules/m_pingpong.c
+++ b/src/modules/m_pingpong.c
@@ -131,8 +131,7 @@ DLLFUNC int  m_ping(aClient *cptr, aClient *sptr, int parc, char *parv[])
 		}
 	}
 	else
-		sendto_one(sptr, ":%s %s %s :%s", me.name,
-		    IsToken(cptr) ? TOK_PONG : MSG_PONG,
+		sendto_one(sptr, ":%s PONG %s :%s", me.name,
 		    (destination) ? destination : me.name, origin);
 	return 0;
 }
diff --git a/src/modules/m_tkl.c b/src/modules/m_tkl.c
index 50d33fa31..a39c59cab 100644
--- a/src/modules/m_tkl.c
+++ b/src/modules/m_tkl.c
@@ -308,9 +308,8 @@ int remove = 0;
 	}
 	if (!MyClient(acptr))
 	{
-		sendto_one(acptr->from, ":%s %s %s :%s",
-			sptr->name, IsToken(acptr->from) ? TOK_TEMPSHUN : MSG_TEMPSHUN,
-			parv[1], comment);
+		sendto_one(acptr->from, ":%s TEMPSHUN %s :%s",
+			sptr->name, parv[1], comment);
 	} else {
 		char buf[1024];
 		if (!remove)
@@ -1828,8 +1827,7 @@ void _tkl_synch(aClient *sptr)
 				if ((tk->type & TKL_SPAMF) && (sptr->proto & PROTO_TKLEXT))
 				{
 					sendto_one(sptr,
-					    ":%s %s + %c %s %s %s %li %li %li %s :%s", me.name,
-					    IsToken(sptr) ? TOK_TKL : MSG_TKL,
+					    ":%s TKL + %c %s %s %s %li %li %li %s :%s", me.name,
 					    typ,
 					    tk->usermask, tk->hostmask, tk->setby,
 					    tk->expire_at, tk->set_at,
@@ -1837,8 +1835,7 @@ void _tkl_synch(aClient *sptr)
 					    tk->reason);
 				} else
 					sendto_one(sptr,
-					    ":%s %s + %c %s %s %s %li %li :%s", me.name,
-					    IsToken(sptr) ? TOK_TKL : MSG_TKL,
+					    ":%s TKL + %c %s %s %s %li %li :%s", me.name,
 					    typ,
 					    tk->usermask ? tk->usermask : "*", tk->hostmask, tk->setby,
 					    tk->expire_at, tk->set_at, tk->reason);