From b81f61ae5849b8787c7a437d5e35a1eb24cc303f Mon Sep 17 00:00:00 2001
From: Aurorablade <lemastera@gmail.com>
Date: Sat, 4 Aug 2018 23:27:20 -0400
Subject: [PATCH] Fixes

---
 code/modules/admin/admin.dm | 2 +-
 code/modules/admin/topic.dm | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm
index d32d020fe0e..eda9f32784e 100644
--- a/code/modules/admin/admin.dm
+++ b/code/modules/admin/admin.dm
@@ -62,7 +62,7 @@ var/global/nologevent = 0
 	body += "<a href='?_src_=holder;subtlemessage=\ref[M]'>SM</a> - "
 	body += "[admin_jump_link(M)]\] </b><br>"
 	if(ishuman(M) && M.mind)
-		body += "<a href='?_src_=holder;HeadsetMessage=\ref[M]'>HM</a>"
+		body += "<a href='?_src_=holder;HeadsetMessage=[M.UID()]'>HM</a>"
 	body += "<b>Mob type:</b> [M.type]<br>"
 	if(M.client)
 		if(M.client.related_accounts_cid.len)
diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm
index e594bbc164f..749341b92b1 100644
--- a/code/modules/admin/topic.dm
+++ b/code/modules/admin/topic.dm
@@ -1675,22 +1675,23 @@
 		if(!check_rights(R_ADMIN))
 			return
 
-		var/mob/M = locate(href_list["CentcommReply"])
+		var/mob/M = locateUID(href_list["CentcommReply"])
 		usr.client.admin_headset_message(M, "Centcomm")
 
 	else if(href_list["SyndicateReply"])
 		if(!check_rights(R_ADMIN))
 			return
 
-		var/mob/M = locate(href_list["SyndicateReply"])
+		var/mob/M = locateUID(href_list["SyndicateReply"])
 		usr.client.admin_headset_message(M, "Syndicate")
 
 	else if(href_list["HeadsetMessage"])
 		if(!check_rights(R_ADMIN))
 			return
 
-		var/mob/M = locate(href_list["HeadsetMessage"])
+		var/mob/M = locateUID(href_list["HeadsetMessage"])
 		usr.client.admin_headset_message(M)
+
 	else if(href_list["EvilFax"])
 		if(!check_rights(R_ADMIN))
 			return