diff --git a/CHANGE LOG 1.0.6.2.txt b/CHANGE LOG 1.0.6.2.txt
index 97d60abc0..dd4f0c95f 100644
--- a/CHANGE LOG 1.0.6.2.txt	
+++ b/CHANGE LOG 1.0.6.2.txt	
@@ -94,6 +94,7 @@
 [FIXED] Death camera height incorrect when player dies above terrain level
 [FIXED] Duplicate weapon error when player dies with the same weapon in hands and on back
 [FIXED] Vehicle getOut event handler no longer runs on M240 Nest and other static weapons.
+[FIXED] Autorun no longer freezes players when they spam the key or attempt to reactivate it near a body of water.
 
 [NOTE] Fixes below were included in hotfix 1.0.6.1A (March 10th 2017) and are now in the default files.
 [FIXED] Fixed food and drink going down 10x faster from melee and other "working" actions. 
diff --git a/SQF/dayz_code/init/compiles.sqf b/SQF/dayz_code/init/compiles.sqf
index 0eaa5f924..38ae914f3 100644
--- a/SQF/dayz_code/init/compiles.sqf
+++ b/SQF/dayz_code/init/compiles.sqf
@@ -155,7 +155,7 @@ if (!isDedicated) then {
 	player_checkRecipe = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_checkRecipe.sqf";	
 		
 	// EPOCH ADDITIONS
-	dayz_autoRunOff = {dayz_autoRun = false; terminate dayz_autoRunThread; player playActionNow "Stop";};
+	dayz_autoRunOff = {dayz_autoRun = false; terminate dayz_autoRunThread; if (speed player > 0) then {player playActionNow "Stop"};};
 	dog_findTargetAgent = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\dog_findTargetAgent.sqf";
 	dze_deathMessage = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\dze_deathMessage.sqf";
 	dze_filterCheats = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\player_filterCheats.sqf";
diff --git a/SQF/dayz_code/system/player_monitor.fsm b/SQF/dayz_code/system/player_monitor.fsm
index 2b018a51d..593a66384 100644
--- a/SQF/dayz_code/system/player_monitor.fsm
+++ b/SQF/dayz_code/system/player_monitor.fsm
@@ -1074,12 +1074,14 @@ class FSM
                          "} else {" \n
                          "	_currentWpn	=	""Makarov"";" \n
                          "	_currentAnim	=	""aidlpercmstpsraswpstdnon_player_idlesteady02"";" \n
-                         "	//Prevent fresh spawns running on login when they died running, switchMove does not stop it" \n
-                         "	disableUserInput true;" \n
-                         "	player playActionNow 'Stop';" \n
-                         "	disableUserInput false;" \n
-                         "	disableUserInput true;" \n
-                         "	disableUserInput false;" \n
+                         "	if (speed player > 0) then {" \n
+                         "		//Prevent fresh spawns running on login when they died running, switchMove does not stop it" \n
+                         "		disableUserInput true;" \n
+                         "		player playActionNow 'Stop';" \n
+                         "		disableUserInput false;" \n
+                         "		disableUserInput true;" \n
+                         "		disableUserInput false;" \n
+                         "	};" \n
                          "};" \n
                          "" \n
                          "reload player;" \n