diff --git a/code/defines/procs/helpers.dm b/code/defines/procs/helpers.dm
index 804cdbb9cb8..a0b230c53e4 100644
--- a/code/defines/procs/helpers.dm
+++ b/code/defines/procs/helpers.dm
@@ -536,6 +536,7 @@
 /proc/clname(var/mob/M as mob) //--All praise goes to NEO|Phyte, all blame goes to DH, and it was Cindi-Kate's idea
 	var/randomname = pick(clown_names)
 	var/newname = input(M,"You are the clown. Would you like to change your name to something else?", "Name change",randomname)
+	var/oldname = M.real_name
 
 	if (length(newname) == 0)
 		newname = randomname
@@ -553,11 +554,17 @@
 		newname = dd_replacetext(newname, ">", "'")
 		M.real_name = newname
 		M.name = newname
-//	if (istype(src.belt, /obj/item/device/pda))
-//		var/obj/item/device/pda/pda = src.belt
-//		pda.owner = src.real_name
-//		pda.ownjob = src.wear_id.assignment
-	//	pda.name = "PDA-[src.real_name] ([pda.ownjob])"
+
+	for (var/obj/item/device/pda/pda in M.contents)
+		if (pda.owner == oldname)
+			pda.owner = newname
+			pda.name = "PDA-[newname] ([pda.ownjob])"
+			break
+	for(var/obj/item/weapon/card/id/id in M.contents)
+		if(id.registered == oldname)
+			id.registered = newname
+			id.name = "[id.registered]'s ID Card ([id.assignment])"
+			break
 
 /proc/ionnum()
 	return "[pick("!","@","#","$","%","^","&","*")][pick(pick("!","@","#","$","%","^","&","*"))][pick(pick("!","@","#","$","%","^","&","*"))][pick(pick("!","@","#","$","%","^","&","*"))]"
diff --git a/code/game/jobs/jobprocs.dm b/code/game/jobs/jobprocs.dm
index cc641af2d65..8428eaef84c 100644
--- a/code/game/jobs/jobprocs.dm
+++ b/code/game/jobs/jobprocs.dm
@@ -654,8 +654,6 @@
 		src.loc = pick(NL)
 	return
 
-	if (rank == "Clown")
-		clname(src)
 
 /mob/living/carbon/human/proc/spawnId(rank)
 	var/obj/item/weapon/card/id/C = null
@@ -685,6 +683,8 @@
 		pda.ownjob = src.wear_id.assignment
 		pda.name = "PDA-[src.real_name] ([pda.ownjob])"
 */
+	if (rank == "Clown")
+		spawn clname(src)
 
 /client/proc/mimewall()
 	set category = "Mime"