diff --git a/code/game/objects/items/weapons/stunbaton.dm b/code/game/objects/items/weapons/stunbaton.dm
index 38fe3df3b40..217a4b9f931 100644
--- a/code/game/objects/items/weapons/stunbaton.dm
+++ b/code/game/objects/items/weapons/stunbaton.dm
@@ -60,7 +60,7 @@
 		..()
 		return
 
-	if(user.a_intent != "help")
+	if(user.a_intent == "hurt")
 		if(!..()) return
 		H.apply_effect(5, WEAKEN, 0)
 		H.visible_message("<span class='danger'>[M] has been beaten with the [src] by [user]!</span>")
@@ -77,7 +77,7 @@
 		H.lastattacker = user
 		charges--
 		H.visible_message("<span class='danger'>[M] has been stunned with the [src] by [user]!</span>")
-		playsound(src.loc, "sparks", 75, 1, -1)
+		playsound(src.loc, 'Egloves.ogg', 50, 1, -1)
 		if(charges < 1)
 			status = 0
 			update_icon()