diff --git a/code/datums/outfits/jobs/job.dm b/code/datums/outfits/jobs/job.dm
index 68d4507fd4..a989311153 100644
--- a/code/datums/outfits/jobs/job.dm
+++ b/code/datums/outfits/jobs/job.dm
@@ -16,6 +16,8 @@
 /decl/hierarchy/outfit/job/equip_id(mob/living/carbon/human/H)
 	var/obj/item/weapon/card/id/C = ..()
 	if(H.mind)
-		if(H.mind.initial_account)
-			C.associated_account_number = H.mind.initial_account.account_number
+		var/datum/mind/M = H.mind
+		if(M.initial_account)
+			var/datum/money_account/A = M.initial_account
+			C.associated_account_number = A.account_number
 	return C
diff --git a/code/game/jobs/job_controller.dm b/code/game/jobs/job_controller.dm
index 5f6f9e3668..be0a0bbd07 100644
--- a/code/game/jobs/job_controller.dm
+++ b/code/game/jobs/job_controller.dm
@@ -373,8 +373,8 @@ var/global/datum/controller/occupations/job_master
 						else
 							spawn_in_storage += thing
 			//Equip job items.
-			job.equip(H, H.mind ? H.mind.role_alt_title : "")
 			job.setup_account(H)
+			job.equip(H, H.mind ? H.mind.role_alt_title : "")
 			job.equip_backpack(H)
 //			job.equip_survival(H)
 			job.apply_fingerprints(H)