diff --git a/code/game/gamemodes/autotraitor/autotraitor.dm b/code/game/gamemodes/autotraitor/autotraitor.dm
index f0ecb88ddca..2459e87bc70 100644
--- a/code/game/gamemodes/autotraitor/autotraitor.dm
+++ b/code/game/gamemodes/autotraitor/autotraitor.dm
@@ -15,6 +15,12 @@
 /datum/game_mode/traitor/autotraitor/pre_setup()
 	possible_traitors = get_players_for_role(BE_TRAITOR)
 
+	for(var/datum/mind/player in possible_traitors)
+		for(var/job in restricted_jobs)
+			if(player.assigned_role == job)
+				possible_traitors -= player
+
+
 	for(var/mob/new_player/P in world)
 		if(P.client && P.ready)
 			num_players++
@@ -78,6 +84,11 @@
 				traitorcount += 1
 			if (player.client && player.mind && !player.mind.special_role && player.stat != 2 && (player.be_syndicate & BE_TRAITOR) && !jobban_isbanned(player, "Syndicate"))
 				possible_traitors += player
+		for(var/datum/mind/player in possible_traitors)
+			for(var/job in restricted_jobs)
+				if(player.assigned_role == job)
+					possible_traitors -= player
+
 		//message_admins("Live Players: [playercount]")
 		//message_admins("Live Traitors: [traitorcount]")
 //		message_admins("Potential Traitors:")
diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm
index 3f43ffc3548..a5463320bb8 100644
--- a/code/modules/mob/living/carbon/human/human_defense.dm
+++ b/code/modules/mob/living/carbon/human/human_defense.dm
@@ -104,7 +104,7 @@ emp_act
 	var/power = I.force
 	if(I.w_class >= 4)
 		power *= 2
-	apply_damage(, I.damtype, affecting, armor, is_cut(I), I.name)
+	apply_damage(power, I.damtype, affecting, armor, is_cut(I), I.name)
 
 	var/bloody = 0
 	if((I.damtype == BRUTE) && prob(25 + (I.force * 2)))