diff --git a/code/game/data_huds.dm b/code/game/data_huds.dm
index e3fa61d3409..4335c65caad 100644
--- a/code/game/data_huds.dm
+++ b/code/game/data_huds.dm
@@ -131,7 +131,7 @@
 	holder.icon_state = "hudno_id"
 	if(wear_id)
 		holder.icon_state = "hud[ckey(wear_id.GetJobName())]"
-
+	sec_hud_set_security_status()
 	var/turf/T = get_turf(src)
 	if (T) crewmonitor.queueUpdate(T.z)
 
@@ -153,16 +153,22 @@
 				holder.icon_state = "hud_imp_chem"
 
 /mob/living/carbon/human/proc/sec_hud_set_security_status()
-	var/image/holder
+	var/image/holder = hud_list[WANTED_HUD]
 	var/perpname = get_face_name(get_id_name(""))
 	if(perpname)
 		var/datum/data/record/R = find_record("name", perpname, data_core.security)
 		if(R)
-			holder = hud_list[WANTED_HUD]
 			switch(R.fields["criminal"])
-				if("*Arrest*")		holder.icon_state = "hudwanted"
-				if("Incarcerated")	holder.icon_state = "hudincarcerated"
-				if("Parolled")		holder.icon_state = "hudparolled"
-				if("Discharged")	holder.icon_state = "huddischarged"
-				else				holder.icon_state = null
-
+				if("*Arrest*")
+					holder.icon_state = "hudwanted"
+					return
+				if("Incarcerated")
+					holder.icon_state = "hudincarcerated"
+					return
+				if("Parolled")
+					holder.icon_state = "hudparolled"
+					return
+				if("Discharged")
+					holder.icon_state = "huddischarged"
+					return
+	holder.icon_state = null
diff --git a/code/modules/mob/living/carbon/human/inventory.dm b/code/modules/mob/living/carbon/human/inventory.dm
index ce5bf0c35ab..f2d63673ca4 100644
--- a/code/modules/mob/living/carbon/human/inventory.dm
+++ b/code/modules/mob/living/carbon/human/inventory.dm
@@ -190,7 +190,7 @@
 		if(internals)
 			internals.icon_state = "internal0"
 		internal = null
-	sec_hud_set_ID()
+	sec_hud_set_security_status()
 	..()
 
 /mob/living/carbon/human/head_update(obj/item/I)
@@ -200,6 +200,7 @@
 		update_inv_glasses()
 	if(I.flags_inv & HIDEEARS)
 		update_body()
+	sec_hud_set_security_status()
 	..()
 
 
diff --git a/code/modules/surgery/plastic_surgery.dm b/code/modules/surgery/plastic_surgery.dm
index 52a52d10a74..ed61adba152 100644
--- a/code/modules/surgery/plastic_surgery.dm
+++ b/code/modules/surgery/plastic_surgery.dm
@@ -21,4 +21,7 @@
 		target.real_name = target.dna.species.random_name(target.gender,1)
 		var/newname = target.real_name	//something about how the code handles names required that I use this instead of target.real_name
 		user.visible_message("[user] alters [oldname]'s appearance completely, they are now [newname]!", "<span class='notice'>You alter [oldname]'s appearance completely, they are now [newname].</span>")
+	if(ishuman(target))
+		var/mob/living/carbon/human/H = target
+		H.sec_hud_set_ID()
 	return 1
\ No newline at end of file
diff --git a/config/admins.txt b/config/admins.txt
index 797a49de2bd..be1f1aaee42 100644
--- a/config/admins.txt
+++ b/config/admins.txt
@@ -95,4 +95,5 @@ CoreOverload = Game Master
 Jalleo = Game Master
 Anonus Tanir = Game Master
 FoxPMcCloud = Game Master
-Xhuis = Game Master
\ No newline at end of file
+Xhuis = Game Master
+Astralenigma = Game Master
\ No newline at end of file