diff --git a/code/game/jobs/access.dm b/code/game/jobs/access.dm
index e29dd1852d8..407ec98b848 100644
--- a/code/game/jobs/access.dm
+++ b/code/game/jobs/access.dm
@@ -487,3 +487,25 @@ proc/FindNameFromID(var/mob/living/carbon/human/H)
 
 		if(ID)
 			return ID.registered_name
+
+proc/get_all_job_icons() //For all existing HUD icons
+	return get_all_jobs() + list("Prisoner")
+
+/obj/proc/GetJobName() //Used in secHUD icon generation
+	if (!istype(src, /obj/item/device/pda) && !istype(src,/obj/item/weapon/card/id))
+		return
+
+	var/jobName
+
+	if(istype(src, /obj/item/device/pda))
+		if(src:id)
+			jobName = src:id:assignment
+	if(istype(src, /obj/item/weapon/card/id))
+		jobName = src:assignment
+
+	if(jobName in get_all_job_icons()) //Check if the job has a hud icon
+		return jobName
+	if(jobName in get_all_centcom_jobs()) //Return with the NT logo if it is a Centcom job
+		return "Centcom"
+	return "Unknown" //Return unknown if none of the above apply
+
diff --git a/code/modules/clothing/glasses/hud.dm b/code/modules/clothing/glasses/hud.dm
index f4c5cc2e56d..2d7beb90ab2 100644
--- a/code/modules/clothing/glasses/hud.dm
+++ b/code/modules/clothing/glasses/hud.dm
@@ -97,7 +97,6 @@
 		if(perp.wear_id)
 			var/obj/item/weapon/card/id/I = perp.wear_id.GetID()
 			if(I)
-				C.images += image(tempHud, perp, "hud[ckey(I.GetJobRealName())]")
 				perpname = I.registered_name
 				holder.icon_state = "hud[ckey(I.GetJobName())]"
 				C.images += holder
diff --git a/code/modules/mob/living/silicon/pai/hud.dm b/code/modules/mob/living/silicon/pai/hud.dm
index 303b52a1928..328d54b2fc7 100644
--- a/code/modules/mob/living/silicon/pai/hud.dm
+++ b/code/modules/mob/living/silicon/pai/hud.dm
@@ -28,15 +28,15 @@
 			for(var/datum/data/record/E in data_core.general)
 				if(E.fields["name"] == perpname)
 					holder = perp.hud_list[WANTED_HUD]
-						for (var/datum/data/record/R in data_core.security)
+					for(var/datum/data/record/R in data_core.security)
 						if((R.fields["id"] == E.fields["id"]) && (R.fields["criminal"] == "*Arrest*"))
 							holder.icon_state = "hudwanted"
 							client.images += holder
-								break
-							else if((R.fields["id"] == E.fields["id"]) && (R.fields["criminal"] == "Incarcerated"))
+							break
+						else if((R.fields["id"] == E.fields["id"]) && (R.fields["criminal"] == "Incarcerated"))
 							holder.icon_state = "hudprisoner"
 							client.images += holder
-								break
+							break
 						else if((R.fields["id"] == E.fields["id"]) && (R.fields["criminal"] == "Parolled"))
 							holder.icon_state = "hudparolled"
 							client.images += holder
diff --git a/code/modules/mob/living/simple_animal/hostile/hostile.dm b/code/modules/mob/living/simple_animal/hostile/hostile.dm
index c0ce321c4dc..ec2205241e3 100644
--- a/code/modules/mob/living/simple_animal/hostile/hostile.dm
+++ b/code/modules/mob/living/simple_animal/hostile/hostile.dm
@@ -40,8 +40,6 @@
 					T = L
 					break
 
-		else
-			if (can_see(src, A, 10))
 		if(istype(A, /obj/mecha))
 			var/obj/mecha/M = A
 			if (M.occupant)