diff --git a/code/datums/mob_hud.dm b/code/datums/mob_hud.dm
index e1d8e46da40b..1790d64ff55d 100644
--- a/code/datums/mob_hud.dm
+++ b/code/datums/mob_hud.dm
@@ -619,6 +619,8 @@ GLOBAL_LIST_INIT_TYPED(huds, /datum/mob_hud, list(
 		var/obj/item/card/id/I = wear_id.GetID()
 		if(I)
 			perpref = I.registered_ref
+	else
+		perpref = WEAKREF(usr)
 
 	if(!GLOB.data_core)
 		return
@@ -635,9 +637,6 @@ GLOBAL_LIST_INIT_TYPED(huds, /datum/mob_hud, list(
 			holder.icon_state = "hudsec_prisoner"
 			criminal = TRUE
 			return
-		if(MOB_STAT_CRIME_NONE)
-			holder.icon_state = null
-			criminal = FALSE
 
 //Squad HUD
 
diff --git a/code/game/machinery/computer/security.dm b/code/game/machinery/computer/security.dm
index e17023e4c198..d77a9f154865 100644
--- a/code/game/machinery/computer/security.dm
+++ b/code/game/machinery/computer/security.dm
@@ -260,6 +260,11 @@
 				visible_message("[SPAN_BOLD("[src]")] states, \"DATACORE FAILURE: Unable to update relevant database logs.\"")
 				return
 			retrieve_target_record(target_mob)
+			if(params["stat"] == MOB_CRIMINAL_STATUS)
+				for(var/mob/living/carbon/human/human as anything in GLOB.human_mob_list)
+					if(human.name == target_mob)
+						human.sec_hud_set_security_status()
+						return TRUE
 			return TRUE
 
 /obj/structure/machinery/computer/secure_data/ui_static_data(mob/user)