diff --git a/code/__HELPERS/game.dm b/code/__HELPERS/game.dm
index cb68fe61fd..c6e6dd547d 100644
--- a/code/__HELPERS/game.dm
+++ b/code/__HELPERS/game.dm
@@ -585,7 +585,7 @@
 	if(character.client && character.client.prefs && character.client?.prefs?.alt_titles_preferences[rank])
 		displayed_rank = character.client?.prefs?.alt_titles_preferences[rank]
 	var/obj/machinery/announcement_system/announcer = pick(GLOB.announcement_systems)
-	announcer.announce("ARRIVAL", character.real_name, displayed_rank, list()) //make the list empty to make it announce it in common
+	announcer.announce("ARRIVAL", character.real_name, rank, displayed_rank, list()) //make the list empty to make it announce it in common
 
 /proc/lavaland_equipment_pressure_check(turf/T)
 	. = FALSE
diff --git a/code/datums/datacore.dm b/code/datums/datacore.dm
index bb0f786fc5..3164b0296d 100644
--- a/code/datums/datacore.dm
+++ b/code/datums/datacore.dm
@@ -172,7 +172,8 @@
 		var/datum/data/record/G = new()
 		G.fields["id"]			= id
 		G.fields["name"]		= H.real_name
-		G.fields["rank"]		= displayed_rank
+		G.fields["rank"]		= assignment
+		G.fields["job_title"]   = displayed_rank
 		G.fields["age"]			= H.age
 		G.fields["species"]	= H.dna.species.name
 		G.fields["fingerprint"]	= md5(H.dna.uni_identity)
diff --git a/code/game/machinery/cryopod.dm b/code/game/machinery/cryopod.dm
index 8ad7df3997..2ed0e7e61f 100644
--- a/code/game/machinery/cryopod.dm
+++ b/code/game/machinery/cryopod.dm
@@ -301,6 +301,7 @@ GLOBAL_LIST_EMPTY(cryopod_computers)
 
 	// Delete them from datacore.
 	var/announce_rank = null
+	var/rank = null
 	for(var/datum/data/record/medical_record as anything in GLOB.data_core.medical)
 		if(medical_record.fields["name"] == mob_occupant.real_name)
 			qdel(medical_record)
@@ -309,7 +310,8 @@ GLOBAL_LIST_EMPTY(cryopod_computers)
 			qdel(security_record)
 	for(var/datum/data/record/general_record as anything in GLOB.data_core.general)
 		if(general_record.fields["name"] == mob_occupant.real_name)
-			announce_rank = general_record.fields["rank"]
+			announce_rank = general_record.fields["job_title"]
+			rank = general_record.fields["rank"]
 			qdel(general_record)
 
 	var/obj/machinery/computer/cryopod/control_computer = control_computer_weakref?.resolve()
@@ -321,7 +323,7 @@ GLOBAL_LIST_EMPTY(cryopod_computers)
 	// Make an announcement and log the person entering storage.
 	if(GLOB.announcement_systems.len && alert_comms) //GS13 EDIT
 		var/obj/machinery/announcement_system/announcer = pick(GLOB.announcement_systems)
-		announcer.announce("CRYOSTORAGE", mob_occupant.real_name, announce_rank, list())
+		announcer.announce("CRYOSTORAGE", mob_occupant.real_name, rank, announce_rank, list())
 
 	visible_message(span_notice("[src] hums and hisses as it moves [mob_occupant.real_name] into storage."))
 
diff --git a/code/modules/jobs/job_types/_job.dm b/code/modules/jobs/job_types/_job.dm
index f9140cfc43..4dabab5035 100644
--- a/code/modules/jobs/job_types/_job.dm
+++ b/code/modules/jobs/job_types/_job.dm
@@ -337,7 +337,6 @@
 			PDA.ownjob = preference_source.prefs.alt_titles_preferences[J.title]
 		else
 			PDA.ownjob = J.title
-		PDA.ownjob = J.title
 		PDA.update_label()
 		if(preference_source && !PDA.equipped) //PDA's screen color, font style and look depend on client preferences.
 			PDA.update_style(preference_source)
diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm
index b4f9b4a8ee..c552a397ef 100644
--- a/code/modules/mob/living/silicon/ai/ai.dm
+++ b/code/modules/mob/living/silicon/ai/ai.dm
@@ -1031,7 +1031,7 @@
 			if(GLOB.announcement_systems.len)
 				// Sends an announcement the AI has cryoed.
 				var/obj/machinery/announcement_system/announcer = pick(GLOB.announcement_systems)
-				announcer.announce("CRYOSTORAGE", src.real_name, announce_rank, list())
+				announcer.announce("CRYOSTORAGE", src.real_name, announce_rank, channels = list())
 			new /obj/structure/ai_core/latejoin_inactive(loc)
 			if(src.mind)
 				//Handle job slot/tater cleanup.