diff --git a/code/controllers/subsystem/tickets.dm b/code/controllers/subsystem/tickets.dm
index 33b4b6ce9ae..a2640ea70ed 100644
--- a/code/controllers/subsystem/tickets.dm
+++ b/code/controllers/subsystem/tickets.dm
@@ -72,7 +72,7 @@ SUBSYSTEM_DEF(tickets)
 	var/client/C = M.client
 
   //Check if the user has an open ticket already within the cooldown period, if so we don't create a new one and re-set the cooldown period
-	var/datum/admin_ticket/existingTicket = checkForOpenTicket(C)
+	var/datum/admin_ticket/existingTicket = checkForOpenTicket(M)
 	if(existingTicket)
 		existingTicket.setCooldownPeriod()
 		to_chat(C, "<span class='adminticket'>Your ticket #[existingTicket.ticketNum] remains open! Visit \"My tickets\" under the Admin Tab to view it.</span>")
@@ -310,7 +310,7 @@ UI STUFF
 
 /datum/controller/subsystem/tickets/proc/userDetailUI(mob/user)
 //dat
-	var/tickets = checkForTicket(user.client)
+	var/tickets = checkForTicket(user)
 	var/dat
 	dat += "<h1>Your open tickets</h1>"
 	dat += "<table>"
diff --git a/code/modules/admin/verbs/adminhelp.dm b/code/modules/admin/verbs/adminhelp.dm
index 196768c4cb3..84695ee799c 100644
--- a/code/modules/admin/verbs/adminhelp.dm
+++ b/code/modules/admin/verbs/adminhelp.dm
@@ -117,15 +117,15 @@ var/list/adminhelp_ignored_words = list("unknown","the","a","an","of","monkey","
 		if("Adminhelp")
 			var/ticketNum // Holder for the ticket number
 			var/prunedmsg ="[usr.client]: [msg]" // Message without links
-			if(SStickets.checkForOpenTicket(usr.client)) // If user already has an open ticket
-				var/datum/admin_ticket/T = SStickets.checkForOpenTicket(usr.client) // Make T equal to the ticket they have open
+			if(SStickets.checkForOpenTicket(usr)) // If user already has an open ticket
+				var/datum/admin_ticket/T = SStickets.checkForOpenTicket(usr) // Make T equal to the ticket they have open
 				ticketNum = T.ticketNum // ticketNum is the number of their ticket.
 				T.addResponse(usr.client, msg)
 			else
 				ticketNum = SStickets.getTicketCounter() // ticketNum is the ticket ready to be assigned.
 			msg = "<span class='adminhelp'>[selected_type]: </span><span class='boldnotice'>[key_name(src, TRUE, selected_type)] (<A HREF='?_src_=holder;adminmoreinfo=[ref_mob]'>?</A>) (<A HREF='?_src_=holder;adminplayeropts=[ref_mob]'>PP</A>) (<A HREF='?_src_=vars;Vars=[mob.UID()]'>VV</A>) (<A HREF='?_src_=holder;subtlemessage=[ref_mob]'>SM</A>) ([admin_jump_link(mob)]) (<A HREF='?_src_=holder;check_antagonist=1'>CA</A>) (<A HREF='?_src_=holder;openadminticket=[ticketNum]'>TICKET</A>) [ai_found ? " (<A HREF='?_src_=holder;adminchecklaws=[ref_mob]'>CL</A>)" : ""](<A HREF='?_src_=holder;take_question=[mob.UID()]'>TAKE</A>) :</span> <span class='adminhelp'>[msg]</span>"
 			//Open a new adminticket and inform the user.
-			SStickets.newTicket(src, prunedmsg, msg)
+			SStickets.newTicket(src.mob, prunedmsg, msg)
 			for(var/client/X in modholders + adminholders)
 				if(X.prefs.sound & SOUND_ADMINHELP)
 					X << 'sound/effects/adminhelp.ogg'
diff --git a/code/modules/admin/verbs/adminpm.dm b/code/modules/admin/verbs/adminpm.dm
index 6cb2d144654..fb28b6db9f2 100644
--- a/code/modules/admin/verbs/adminpm.dm
+++ b/code/modules/admin/verbs/adminpm.dm
@@ -187,15 +187,15 @@
 		return
 	//Check if the mob being PM'd has any open admin tickets.
 	var/tickets = list()
-	tickets = SStickets.checkForTicket(C)
+	tickets = SStickets.checkForTicket(C.mob)
 	if(tickets)
 		for(var/datum/admin_ticket/i in tickets)
 			i.addResponse(src, msg) // Add this response to their open tickets.
 		return
 
-	tickets = SStickets.checkForTicket(src)
+	tickets = SStickets.checkForTicket(C.mob)
 	if(check_rights(R_ADMIN|R_MOD, 0, C.mob)) //Is the person being pm'd an admin? If so we check if the pm'er has open tickets
-		tickets = SStickets.checkForTicket(src)
+		tickets = SStickets.checkForTicket(C.mob)
 		if(tickets)
 			for(var/datum/admin_ticket/i in tickets)
 				i.addResponse(src, msg)