diff --git a/code/game/jobs/job_controller.dm b/code/game/jobs/job_controller.dm
index 842cb714481..96146b304d8 100644
--- a/code/game/jobs/job_controller.dm
+++ b/code/game/jobs/job_controller.dm
@@ -123,7 +123,7 @@ var/global/datum/controller/occupations/job_master
 	return
 
 
-//This proc is called before the level loop of DivideOccupations() and will try to select a head, ignoring ALL non-head preferences for every level until�
+//This proc is called before the level loop of DivideOccupations() and will try to select a head, ignoring ALL non-head preferences for every level until
 //it locates a head or runs out of levels to check
 //This is basically to ensure that there's atleast a few heads in the round
 /datum/controller/occupations/proc/FillHeadPosition()
@@ -276,7 +276,7 @@ var/global/datum/controller/occupations/job_master
 	// Hand out random jobs to the people who didn't get any in the last check
 	// Also makes sure that they got their preference correct
 	for(var/mob/new_player/player in unassigned)
-		if(player.client.prefs.userandomjob)
+		if(player.client.prefs.userandomjob || jobban_isbanned(player, "Assistant"))
 			GiveRandomJob(player)
 
 	Debug("DO, Standard Check end")
diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm
index abc1c17eb57..8605854a4df 100644
--- a/code/modules/client/preferences.dm
+++ b/code/modules/client/preferences.dm
@@ -533,7 +533,10 @@ datum/preferences
 					ResetJobs()
 					SetChoices(user)
 				if("random")
-					userandomjob = !userandomjob
+					if(jobban_isbanned(user, "Assistant"))
+						userandomjob = 1
+					else
+						userandomjob = !userandomjob
 					SetChoices(user)
 				if("setJobLevel")
 					UpdateJobPreference(user, href_list["text"], text2num(href_list["level"]))