diff --git a/extensions/m_oaccept.c b/extensions/m_oaccept.c
index a01a962..97748af 100644
--- a/extensions/m_oaccept.c
+++ b/extensions/m_oaccept.c
@@ -31,13 +31,13 @@ mo_oaccept(struct Client *client_p, struct Client *source_p, int parc, const cha
 	/* Don't allow someone to pointlessly fill up someone's metadata
 	 * with identical OACCEPT entries. */
 	if((md = user_metadata_find(target_p, "OACCEPT")))
-		if(!strcmp(source_p->name, md->value))
+		if(!strcmp(source_p->id, md->value))
 		{
 			sendto_one_notice(source_p, ":You're already on %s's OACCEPT list", target_p->name);
 			return;
 		}
 
-	user_metadata_add(target_p, "OACCEPT", source_p->name, 1);
+	user_metadata_add(target_p, "OACCEPT", source_p->id, 1);
 
 	sendto_wallops_flags(UMODE_WALLOP, &me,
 			     "OACCEPT called for %s by %s!%s@%s",
diff --git a/modules/core/m_message.c b/modules/core/m_message.c
index 168b5b4..292f352 100644
--- a/modules/core/m_message.c
+++ b/modules/core/m_message.c
@@ -806,7 +806,7 @@ msg_client(int p_or_n, const char *command,
 			{
 				DICTIONARY_FOREACH(md, &iter, target_p->user->metadata)
 				{
-					if(!strcmp(md->value, source_p->name))
+					if(!strcmp(md->value, source_p->id))
 					{
 						add_reply_target(target_p, source_p);
 						sendto_one(target_p, ":%s!%s@%s %s %s :%s",