diff --git a/code/game/gamemodes/shadowling/special_shadowling_abilities.dm b/code/game/gamemodes/shadowling/special_shadowling_abilities.dm
index 1ab065b706b..ad264b54ac5 100644
--- a/code/game/gamemodes/shadowling/special_shadowling_abilities.dm
+++ b/code/game/gamemodes/shadowling/special_shadowling_abilities.dm
@@ -26,7 +26,7 @@ var/list/possibleShadowlingNames = list("U'ruan", "Y`shej", "Nex", "Hel-uae", "N
 
 			for(var/obj/item/I in H) //drops all items
 				H.unEquip(I)
-
+			H.status_flags |= GODMODE //Can't die while hatching
 			sleep(50)
 			var/turf/simulated/floor/F
 			var/turf/shadowturf = get_turf(user)
@@ -36,7 +36,6 @@ var/list/possibleShadowlingNames = list("U'ruan", "Y`shej", "Nex", "Hel-uae", "N
 				qdel(R)
 				new /obj/structure/alien/weeds/node(shadowturf) //Dim lighting in the chrysalis -- removes itself afterwards
 			var/temp_flags = H.status_flags
-			H.status_flags |= GODMODE //Can't die while hatching
 
 			H.visible_message("<span class='warning'>A chrysalis forms around [H], sealing them inside.</span>", \
 							"<span class='shadowling'>You create your chrysalis and begin to contort within.</span>")
diff --git a/code/modules/admin/verbs/one_click_antag.dm b/code/modules/admin/verbs/one_click_antag.dm
index 3ea77f65259..fdf936ae8f2 100644
--- a/code/modules/admin/verbs/one_click_antag.dm
+++ b/code/modules/admin/verbs/one_click_antag.dm
@@ -332,7 +332,7 @@
 			Commando << missiondesc
 
 			if(config.enforce_human_authority)
-				Commando.set_species("human")
+				Commando.set_species(/datum/species/human)
 
 			//Logging and cleanup
 			if(numagents == 1)
@@ -411,6 +411,9 @@
 		missionobj.completed = 1
 		newmob.mind.objectives += missionobj
 
+		if(config.enforce_human_authority)
+			newmob.set_species(/datum/species/human)
+
 		//Greet the official
 		newmob << "<B><font size=3 color=red>You are a Centcom Official.</font></B>"
 		newmob << "<BR>Central Command is sending you to [station_name()] with the task: [mission]"
@@ -519,7 +522,7 @@
 			ERTOperative << missiondesc
 
 			if(config.enforce_human_authority)
-				ERTOperative.set_species("human")
+				ERTOperative.set_species(/datum/species/human)
 
 			//Logging and cleanup
 			if(numagents == 1)