diff --git a/code/datums/configuration.dm b/code/datums/configuration.dm
index d9c6d31e374..e9c2d26b7db 100644
--- a/code/datums/configuration.dm
+++ b/code/datums/configuration.dm
@@ -34,6 +34,7 @@
 	var/popup_admin_pm = 0				//adminPMs to non-admins show in a pop-up 'reply' window when set to 1.
 	var/Ticklag = 0.9
 	var/Tickcomp = 0
+	var/no_taj = 0
 
 	var/list/mode_names = list()
 	var/list/modes = list()				// allowed modes
@@ -305,6 +306,9 @@
 				if("tickcomp")
 					Tickcomp = 1
 
+				if("no_taj")
+					no_taj = 1
+
 				else
 					diary << "Unknown setting in configuration: '[name]'"
 
diff --git a/code/modules/mob/living/carbon/human/Tajara/tajara_transformation.dm b/code/modules/mob/living/carbon/human/Tajara/tajara_transformation.dm
index 2ffca9de13b..7ea9c26374c 100644
--- a/code/modules/mob/living/carbon/human/Tajara/tajara_transformation.dm
+++ b/code/modules/mob/living/carbon/human/Tajara/tajara_transformation.dm
@@ -52,5 +52,9 @@
 		src << "Only administrators may use this command."
 		return
 
+	if(config.no_taj)
+		src << "Sorry, Tajarans are not allowed on this server." // For some reason allowing them is a big enough fucking issue that I have to add this flag
+		return
+
 	if(istype(H))
 		H:Tajaraize()
\ No newline at end of file
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index 85a5b1fa614..6666dc4c46b 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -97,6 +97,11 @@
 
 		src << "\blue Your icons have been generated!"
 
+
+	spawn(10) // Failsafe for.. weirdness.
+		update_clothing()
+		update_body()
+
 	vessel = new/datum/reagents(600)
 	vessel.my_atom = src
 	vessel.add_reagent("blood",560)