diff --git a/code/defines/procs/hud.dm b/code/defines/procs/hud.dm
index be88cc67ea3..7b090cacd78 100644
--- a/code/defines/procs/hud.dm
+++ b/code/defines/procs/hud.dm
@@ -92,12 +92,9 @@ mob/proc/in_view(var/turf/T)
 
 proc/get_sec_hud_icon(var/mob/living/carbon/human/H)//This function is called from human/life,dm, ~line 1663
 	var/state
-	if(H.wear_id)
-		var/obj/item/card/id/I = H.wear_id.GetID()
-		if(I)
-			state = "hud[ckey(I.GetJobName())]"
-		else
-			state = "hudunknown"
+	var/obj/item/card/id/I = H.GetIdCard()
+	if(I)
+		state = "hud[ckey(I.GetJobName())]"
 	else
 		state = "hudunknown"
 
diff --git a/code/game/jobs/job/civilian.dm b/code/game/jobs/job/civilian.dm
index f78ce9310ff..9422d6e3dbd 100644
--- a/code/game/jobs/job/civilian.dm
+++ b/code/game/jobs/job/civilian.dm
@@ -200,7 +200,7 @@
 	faction = "Station"
 	total_positions = 1
 	spawn_positions = 1
-	supervisors = "the service managaer"
+	supervisors = "the executive officer"
 	selection_color = "#90524b"
 
 	minimum_character_age = list(
@@ -456,7 +456,7 @@
 	faction = "Station"
 	total_positions = 3
 	spawn_positions = 3
-	supervisors = "the supply manager"
+	supervisors = "the operations manager"
 	selection_color = "#7B431C"
 
 	minimum_character_age = list(
@@ -496,7 +496,7 @@
 	faction = "Station"
 	total_positions = 3
 	spawn_positions = 3
-	supervisors = "the supply manager"
+	supervisors = "the operations manager"
 	selection_color = "#7B431C"
 	economic_modifier = 5
 
@@ -548,7 +548,7 @@
 	faction = "Station"
 	total_positions = 2
 	spawn_positions = 2
-	supervisors = "operations manager"
+	supervisors = "the operations manager"
 	selection_color = "#7B431C"
 	economic_modifier = 5
 
diff --git a/code/game/jobs/job/medical.dm b/code/game/jobs/job/medical.dm
index a52e5cd05da..540f09db860 100644
--- a/code/game/jobs/job/medical.dm
+++ b/code/game/jobs/job/medical.dm
@@ -139,7 +139,7 @@
 
 /datum/outfit/job/doctor/surgeon
 	name = "Surgeon"
-	jobtype = /datum/job/doctor
+	jobtype = /datum/job/surgeon
 
 	uniform = /obj/item/clothing/under/rank/medical/surgeon
 	suit = /obj/item/clothing/suit/storage/toggle/labcoat/nt
diff --git a/code/game/jobs/job/ship_crew.dm b/code/game/jobs/job/ship_crew.dm
index aaa4dfc7e36..1eb22839e22 100644
--- a/code/game/jobs/job/ship_crew.dm
+++ b/code/game/jobs/job/ship_crew.dm
@@ -45,12 +45,16 @@
 	blacklisted_species = list(SPECIES_VAURCA_BREEDER)
 
 /datum/outfit/job/visitor
-	name = "Visitor"
+	name = "Off-Duty Crew Member"
 	jobtype = /datum/job/visitor
 
 	uniform = /obj/item/clothing/under/color/black
 	shoes = /obj/item/clothing/shoes/black
 
+/datum/outfit/job/visitor/passenger
+	name = "Passenger"
+	jobtype = /datum/job/passenger
+
 /datum/job/passenger
 	title = "Passenger"
 	flag = PASSENGER
@@ -64,6 +68,6 @@
 	economic_modifier = 1
 	access = list()
 	minimal_access = list()
-	outfit = /datum/outfit/job/visitor
+	outfit = /datum/outfit/job/visitor/passenger
 	blacklisted_species = null
 	blacklisted_species = list(SPECIES_VAURCA_BREEDER)
diff --git a/code/game/objects/items/weapons/cards_ids.dm b/code/game/objects/items/weapons/cards_ids.dm
index 967f0b31361..8fd21c3c4aa 100644
--- a/code/game/objects/items/weapons/cards_ids.dm
+++ b/code/game/objects/items/weapons/cards_ids.dm
@@ -131,6 +131,10 @@ var/const/NO_EMAG_ACT = -50
 	if (..(user, 1))
 		show(user)
 
+/obj/item/card/id/on_slotmove(var/mob/living/user, slot)
+	. = ..(user, slot)
+	BITSET(user.hud_updateflag, ID_HUD) //Update ID HUD if an ID is ever moved
+
 /obj/item/card/id/proc/prevent_tracking()
 	return 0
 
diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index 311ed490787..b277120aced 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -21,6 +21,11 @@ var/mob/living/next_point_time = 0
 	if(.)
 		visible_message("<b>\The [src]</b> points to \the [A].")
 
+/mob/living/drop_from_inventory(var/obj/item/W, var/atom/target)
+	. = ..(W, target)
+	if(W && W.GetID())
+		BITSET(hud_updateflag, ID_HUD) //If we drop our ID, update ID HUD
+
 /*one proc, four uses
 swapping: if it's 1, the mobs are trying to switch, if 0, non-passive is pushing passive
 default behaviour is:
diff --git a/code/modules/modular_computers/computers/modular_computer/core.dm b/code/modules/modular_computers/computers/modular_computer/core.dm
index ebb3e1c23e5..f71a5c0d65e 100644
--- a/code/modules/modular_computers/computers/modular_computer/core.dm
+++ b/code/modules/modular_computers/computers/modular_computer/core.dm
@@ -499,3 +499,7 @@
 	silent = !silent
 	for (var/datum/computer_file/program/P in hard_drive.stored_files)
 		P.event_silentmode()
+
+/obj/item/modular_computer/on_slotmove(var/mob/living/user, slot)
+	. = ..(user, slot)
+	BITSET(user.hud_updateflag, ID_HUD) //Same reasoning as for IDs
\ No newline at end of file
diff --git a/html/changelogs/HUDandRankFixes.yml b/html/changelogs/HUDandRankFixes.yml
new file mode 100644
index 00000000000..72b3188b268
--- /dev/null
+++ b/html/changelogs/HUDandRankFixes.yml
@@ -0,0 +1,7 @@
+author: Sparky_hotdog
+
+delete-after: True
+
+changes:
+  - tweak: "All roles should now use the correct security HUD icon."
+  - tweak: "Security HUDs now read IDs in the same manner as airlocks."