diff --git a/code/game/jobs/access.dm b/code/game/jobs/access.dm
index 074d90f682..df4059fda4 100644
--- a/code/game/jobs/access.dm
+++ b/code/game/jobs/access.dm
@@ -188,9 +188,7 @@
 		"BlackOps Commander",
 		"Supreme Commander",
 		"Emergency Response Team",
-		"Emergency Response Team Leader",
-		"Centcom Visitor",
-		"Centcom Officer")
+		"Emergency Response Team Leader")
 
 /mob/proc/GetIdCard()
 	return null
@@ -225,17 +223,15 @@ proc/get_all_job_icons() //For all existing HUD icons
 	var/obj/item/weapon/card/id/I = GetID()
 
 	if(I)
+		if(istype(I,/obj/item/weapon/card/id/centcom))
+			return "Centcom"
+
 		var/job_icons = get_all_job_icons()
 		if(I.assignment	in job_icons) //Check if the job has a hud icon
 			return I.assignment
 		if(I.rank in job_icons)
 			return I.rank
 
-		var/centcom = get_all_centcom_jobs()
-		if(I.assignment	in centcom) //Return with the NT logo if it is a Centcom job
-			return "Centcom"
-		if(I.rank in centcom)
-			return "Centcom"
 	else
 		return
 
diff --git a/code/game/jobs/job/special.dm b/code/game/jobs/job/special.dm
index f5a18e2f0b..9b5cc7b86f 100644
--- a/code/game/jobs/job/special.dm
+++ b/code/game/jobs/job/special.dm
@@ -81,3 +81,78 @@
 		var/access = get_all_station_access()
 		access += list("VIP Guest","Custodian","Thunderdome Overseer","Intel Officer","Medical Officer","Death Commando","Research Officer")
 		return access
+
+/datum/job/clown
+	title = "Clown"
+	flag = CLOWN
+	department = "Civilian"
+	department_flag = CIVILIAN
+	faction = "Station"
+	total_positions = -1
+	spawn_positions = -1
+	supervisors = "the spirit of laughter"
+	selection_color = "#515151"
+	economic_modifier = 1
+	access = list()
+	minimal_access = list()
+	alt_titles = list("Fun Mage","Happiness Witch","Joy Summoner","Asshole")
+	whitelist_only = 1
+
+	equip(var/mob/living/carbon/human/H)
+		if(!H)	return 0
+		H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/clown(H), slot_back)
+		H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/clown(H), slot_w_uniform)
+		H.equip_to_slot_or_del(new /obj/item/clothing/shoes/clown_shoes(H), slot_shoes)
+		H.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/clown_hat(H), slot_wear_mask)
+		H.equip_to_slot_or_del(new /obj/item/device/pda/clown(H), slot_belt)
+
+		if(H.backbag > 0)
+			H.equip_to_slot_or_del(new /obj/item/weapon/stamp/clown(H.back), slot_in_backpack)
+		else
+			H.equip_to_slot_or_del(new /obj/item/weapon/stamp/clown(H), slot_l_hand)
+
+		return 1
+
+/datum/job/clown/get_access()
+	if(config.assistant_maint)
+		return list(access_maint_tunnels)
+	else
+		return list()
+
+/datum/job/mime
+	title = "Mime"
+	flag = MIME
+	department = "Civilian"
+	department_flag = CIVILIAN
+	faction = "Station"
+	total_positions = -1
+	spawn_positions = -1
+	supervisors = "the spirit of performance"
+	selection_color = "#515151"
+	economic_modifier = 1
+	access = list()
+	minimal_access = list()
+	alt_titles = list("Silent One","The Performer","Kabuki","Asshole")
+	whitelist_only = 1
+
+	equip(var/mob/living/carbon/human/H)
+		if(!H)	return 0
+		H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack(H), slot_back)
+		H.equip_to_slot_or_del(new /obj/item/clothing/under/mime(H), slot_w_uniform)
+		H.equip_to_slot_or_del(new /obj/item/clothing/shoes/mime(H), slot_shoes)
+		H.equip_to_slot_or_del(new /obj/item/clothing/head/soft/mime(H), slot_head)
+		H.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/mime(H), slot_wear_mask)
+		H.equip_to_slot_or_del(new /obj/item/device/pda/mime(H), slot_belt)
+
+		if(H.backbag > 0)
+			H.equip_to_slot_or_del(new /obj/item/weapon/pen/crayon/mime(H.back), slot_in_backpack)
+		else
+			H.equip_to_slot_or_del(new /obj/item/weapon/pen/crayon/mime(H), slot_l_hand)
+
+		return 1
+
+/datum/job/mime/get_access()
+	if(config.assistant_maint)
+		return list(access_maint_tunnels)
+	else
+		return list()
diff --git a/code/game/jobs/whitelist_vr.dm b/code/game/jobs/whitelist_vr.dm
index f9180a9d25..0fce896808 100644
--- a/code/game/jobs/whitelist_vr.dm
+++ b/code/game/jobs/whitelist_vr.dm
@@ -1,8 +1,7 @@
 var/list/job_whitelist = list()
 
 /hook/startup/proc/loadJobWhitelist()
-	if(config.usewhitelist)
-		load_jobwhitelist()
+	load_jobwhitelist()
 	return 1
 
 /proc/load_jobwhitelist()
@@ -24,9 +23,9 @@ var/list/job_whitelist = list()
 		return 0
 	if(M && rank)
 		for (var/s in job_whitelist)
-			if(findtext(s,"[M.ckey] - [rank]"))
+			if(findtext(s,"[lowertext(M.ckey)] - [lowertext(rank)]"))
 				return 1
 			if(findtext(s,"[M.ckey] - All"))
 				return 1
 	return 0
-	
+