diff --git a/code/modules/awaymissions/capture_the_flag.dm b/code/modules/awaymissions/capture_the_flag.dm
index 2a3d7a8c612..3dd0e6d5d70 100644
--- a/code/modules/awaymissions/capture_the_flag.dm
+++ b/code/modules/awaymissions/capture_the_flag.dm
@@ -48,7 +48,8 @@
 		STOP_PROCESSING(SSobj, src)
 
 /obj/item/weapon/twohanded/ctf/attack_hand(mob/living/user)
-	if(!user)
+	if(!is_ctf_target(user))
+		to_chat(user, "Non players shouldn't be moving the flag!")
 		return
 	if(team in user.faction)
 		to_chat(user, "You can't move your own flag!")
@@ -510,6 +511,7 @@
 	R.set_frequency(REDTEAM_FREQ)
 	R.freqlock = TRUE
 	R.independent = TRUE
+	H.dna.species.stunmod = 0
 
 /datum/outfit/ctf/blue/post_equip(mob/living/carbon/human/H)
 	..()
@@ -517,6 +519,7 @@
 	R.set_frequency(BLUETEAM_FREQ)
 	R.freqlock = TRUE
 	R.independent = TRUE
+	H.dna.species.stunmod = 0
 
 
 
@@ -534,6 +537,8 @@
 	return
 
 /obj/structure/trap/ctf/trap_effect(mob/living/L)
+	if(!is_ctf_target(L))
+		return
 	if(!(src.team in L.faction))
 		to_chat(L, "<span class='danger'><B>Stay out of the enemy spawn!</B></span>")
 		L.death()