diff --git a/code/controllers/subsystems/job.dm b/code/controllers/subsystems/job.dm
index 3d685e7f4cd..e3bab42ff77 100644
--- a/code/controllers/subsystems/job.dm
+++ b/code/controllers/subsystems/job.dm
@@ -487,30 +487,17 @@
 		Debug("EP/([H]): Abort, H is null.")
 		return null
 
-	switch(rank)
-		if("Cyborg")
-			Debug("EP/([H]): Abort, H is borg..")
-			return EquipRank(H, rank, 1)
-		if("AI")
-			Debug("EP/([H]): Abort, H is AI.")
-			return EquipRank(H, rank, 1)
-
-	if(!current_map.command_spawn_enabled || spawning_at != "Arrivals Shuttle")
-		return EquipRank(H, rank, 1)
+	EquipRank(H, rank, joined_late)
 
 	if("Arrivals Shuttle" in current_map.allowed_spawns)
 		H.centcomm_despawn_timer = addtimer(CALLBACK(H, /mob/living/.proc/centcomm_timeout), 10 MINUTES, TIMER_STOPPABLE)
+		if(spawning_at == "Arrivals Shuttle")
+			to_chat(H,SPAN_NOTICE("You have ten minutes to reach the station before you will be forced there."))
 
 	var/datum/job/job = GetJob(rank)
-
 	H.job = rank
 
-	if(spawning_at != "Arrivals Shuttle" || job.latejoin_at_spawnpoints)
-		return EquipRank(H, rank, 1)
-
 	var/list/spawn_in_storage = list()
-	if(spawning_at == "Arrivals Shuttle")
-		to_chat(H,SPAN_NOTICE("You have ten minutes to reach the station before you will be forced there."))
 
 	if(H.needs_wheelchair())
 		H.equip_wheelchair()
diff --git a/code/modules/mob/abstract/new_player/new_player.dm b/code/modules/mob/abstract/new_player/new_player.dm
index ed1deee67fd..d8c46be6c8d 100644
--- a/code/modules/mob/abstract/new_player/new_player.dm
+++ b/code/modules/mob/abstract/new_player/new_player.dm
@@ -237,6 +237,9 @@ INITIALIZE_IMMEDIATE(/mob/abstract/new_player)
 	if(!IsJobAvailable(rank))
 		to_chat(usr, "<span class='notice'>[rank] is not available. Please try another.</span>")
 		return 0
+	if(!(spawning_at in current_map.allowed_spawns))
+		to_chat(usr, SPAN_NOTICE("Spawn location [spawning_at] invalid for [current_map]. Defaulting to [current_map.default_spawn]."))
+		spawning_at = current_map.default_spawn
 
 	spawning = 1
 	close_spawn_windows()
diff --git a/html/changelogs/johnwildkins-fixlatejoin.yml b/html/changelogs/johnwildkins-fixlatejoin.yml
new file mode 100644
index 00000000000..71a121377c5
--- /dev/null
+++ b/html/changelogs/johnwildkins-fixlatejoin.yml
@@ -0,0 +1,7 @@
+author: JohnWildkins
+
+delete-after: True
+
+changes:
+  - bugfix: "Fixed latejoins not receiving job equipment / IDs."
+  - bugfix: "Fixed saved Aurora spawnpoints being used for Horizon."
diff --git a/maps/sccv_horizon/code/sccv_horizon.dm b/maps/sccv_horizon/code/sccv_horizon.dm
index bd5c2285526..951c55e7ffb 100644
--- a/maps/sccv_horizon/code/sccv_horizon.dm
+++ b/maps/sccv_horizon/code/sccv_horizon.dm
@@ -122,6 +122,7 @@
 
 	evac_controller_type = /datum/evacuation_controller/starship
 
+	allowed_spawns = list("Living Quarters Lift", "Cryogenic Storage")
 	spawn_types = list(/datum/spawnpoint/living_quarters_lift, /datum/spawnpoint/cryo)
 	default_spawn = "Living Quarters Lift"