diff --git a/missions/harmful_crysalis.cdogscpn/guns.json b/missions/harmful_crysalis.cdogscpn/guns.json
index 1e1983469..ea09a921c 100644
--- a/missions/harmful_crysalis.cdogscpn/guns.json
+++ b/missions/harmful_crysalis.cdogscpn/guns.json
@@ -24,7 +24,8 @@
       "Sound": "",
       "SwitchSound": "chainsaw_switch",
       "SoundLockLength": 50,
-      "CanShoot": false
+      "CanShoot": false,
+      "Auto": true
     },
     {
       "Pic": "blaster_white",
diff --git a/src/cdogs/actors.c b/src/cdogs/actors.c
index 7a5d4c9ef..04151e50a 100644
--- a/src/cdogs/actors.c
+++ b/src/cdogs/actors.c
@@ -1130,13 +1130,13 @@ static bool ActorTryMove(TActor *actor, int cmd, int ticks)
 	actor->PlayerUID < 0 ? (actor->flags & FLAGS_MOVE_AND_SHOOT) :
 	(
 	 ConfigGetEnum(&gConfig, "Game.FireMoveStyle") != FIREMOVE_STOP ||
-		!actor->hasShot ||
 		(ConfigGetEnum(&gConfig, "Game.SwitchMoveStyle") ==
 			 SWITCHMOVE_STRAFE &&
 		 Button2(cmd))
 	 );
+	const bool canMove = !actor->hasShot || canMoveWhenShooting;
 	const bool willMove =
-		!actor->petrified && CMD_HAS_DIRECTION(cmd) && canMoveWhenShooting;
+		!actor->petrified && CMD_HAS_DIRECTION(cmd) && canMove;
 	actor->MoveVel = svec2_zero();
 	if (willMove)
 	{
diff --git a/src/cdogs/player_template.c b/src/cdogs/player_template.c
index ab90bf979..88795b3ba 100644
--- a/src/cdogs/player_template.c
+++ b/src/cdogs/player_template.c
@@ -125,7 +125,7 @@ void PlayerTemplatesLoad(PlayerTemplates *pt, const CharacterClasses *classes)
 	FILE *f = fopen(GetConfigFilePath(PLAYER_TEMPLATE_FILE), "r");
 	if (!f)
 	{
-		LOG(LM_MAIN, LL_ERROR, "loading player templates '%s'",
+		LOG(LM_MAIN, LL_WARN, "player templates file missing '%s'",
 			PLAYER_TEMPLATE_FILE);
 		goto bail;
 	}