diff --git a/code/modules/tickets/procs.dm b/code/modules/tickets/procs.dm
index 085de99def..47629dc5e7 100644
--- a/code/modules/tickets/procs.dm
+++ b/code/modules/tickets/procs.dm
@@ -19,7 +19,7 @@
 	//remove out adminhelp verb temporarily to prevent spamming of admins.
 	remove_verb(src,/client/verb/mentorhelp)
 	spawn(600)
-		add_verb(src,/client/verb/mentorhelp	) // 1 minute cool-down for mentorhelps
+		add_verb(src,/client/verb/mentorhelp) // 1 minute cool-down for mentorhelps
 
 	feedback_add_details("admin_verb","Mentorhelp") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 	if(current_ticket)
diff --git a/code/modules/tickets/tickets_player_ui.dm b/code/modules/tickets/tickets_player_ui.dm
index 42e5291b6d..31e3ed6f07 100644
--- a/code/modules/tickets/tickets_player_ui.dm
+++ b/code/modules/tickets/tickets_player_ui.dm
@@ -43,24 +43,10 @@
 			var/sane_message = sanitize(params["msg"])
 			switch(T.level)
 				if (0)
-					if(T.initiator == ui.user.client)
-						var/client/handler = T.handler_ref?.resolve()
-						if(handler)
-							ui.user.client.cmd_mentor_pm(handler, sane_message, T)
-							return TRUE
-						T.AddInteraction("[T.initiator_key_name]: [sane_message]")
-						return TRUE
-					ui.user.client.cmd_mentor_pm(T.initiator, sane_message, T)
+					ui.user.client.cmd_mentor_pm(T.handler_ref?.resolve(), sane_message, T)
 					return TRUE
 				if (1)
-					if(T.initiator == ui.user.client)
-						var/client/handler = T.handler_ref?.resolve()
-						if(handler)
-							ui.user.client.cmd_admin_pm(handler, sane_message, T)
-							return TRUE
-						T.AddInteraction("[key_name_admin(ui.user)]: [sane_message]")
-						return TRUE
-					ui.user.client.cmd_admin_pm(T.initiator, sane_message, T)
+					ui.user.client.cmd_admin_pm(T.handler_ref?.resolve(), sane_message, T)
 					return TRUE
 
 			. = TRUE