diff --git a/modules/core/m_message.c b/modules/core/m_message.c
index a6ac60d3..c19c8517 100644
--- a/modules/core/m_message.c
+++ b/modules/core/m_message.c
@@ -361,7 +361,9 @@ build_target_list(int p_or_n, const char *command, struct Client *client_p,
 				if(!IsServer(source_p) && !IsService(source_p) && !is_chanop_voiced(msptr))
 				{
 					sendto_one(source_p, form_str(ERR_CHANOPRIVSNEEDED),
-						   me.name, source_p->name, with_prefix);
+						   get_id(&me, source_p),
+						   get_id(source_p, source_p),
+						   with_prefix);
 					return (-1);
 				}
 
diff --git a/modules/m_topic.c b/modules/m_topic.c
index d8ad5b9d..7e6206e4 100644
--- a/modules/m_topic.c
+++ b/modules/m_topic.c
@@ -133,7 +133,8 @@ m_topic(struct Client *client_p, struct Client *source_p, int parc, const char *
 		}
 		else
 			sendto_one(source_p, form_str(ERR_CHANOPRIVSNEEDED),
-					me.name, source_p->name, name);
+					get_id(&me, source_p),
+					get_id(source_p, source_p), name);
 	}
 	else if(MyClient(source_p))
 	{