diff --git a/direct/src/controls/BattleWalker.py b/direct/src/controls/BattleWalker.py
index 319ba81253..b6d3675b2a 100755
--- a/direct/src/controls/BattleWalker.py
+++ b/direct/src/controls/BattleWalker.py
@@ -36,6 +36,12 @@ class BattleWalker(GravityWalker.GravityWalker):
         slideLeft = inputState.isSet("slideLeft")
         slideRight = inputState.isSet("slideRight")
         jump = inputState.isSet("jump")
+        
+        # Check for Auto-Run
+        if base.localAvatar.getAutoRun():
+            forward = 1
+            reverse = 0
+        
         # Determine what the speeds are based on the buttons:
         self.speed=(forward and self.avatarControlForwardSpeed or
                     reverse and -self.avatarControlReverseSpeed)
diff --git a/direct/src/controls/DevWalker.py b/direct/src/controls/DevWalker.py
index 8f462b3030..5f3600f6f6 100755
--- a/direct/src/controls/DevWalker.py
+++ b/direct/src/controls/DevWalker.py
@@ -110,6 +110,12 @@ class DevWalker(DirectObject.DirectObject):
         levitateUp = inputState.isSet("levitateUp")
         levitateDown = inputState.isSet("levitateDown")
         run = inputState.isSet("run") and self.runMultiplier or 1.0
+
+        # Check for Auto-Run
+        if base.localAvatar.getAutoRun():
+            forward = 1
+            reverse = 0
+        
         # Determine what the speeds are based on the buttons:
         self.speed=(
                 (forward and self.avatarControlForwardSpeed or
diff --git a/direct/src/controls/GravityWalker.py b/direct/src/controls/GravityWalker.py
index d33d420890..e22890de70 100755
--- a/direct/src/controls/GravityWalker.py
+++ b/direct/src/controls/GravityWalker.py
@@ -460,6 +460,12 @@ class GravityWalker(DirectObject.DirectObject):
         slideLeft = inputState.isSet("slideLeft")
         slideRight = inputState.isSet("slideRight")
         jump = inputState.isSet("jump")
+
+        # Check for Auto-Run
+        if base.localAvatar.getAutoRun():
+            forward = 1
+            reverse = 0
+        
         # Determine what the speeds are based on the buttons:
         self.speed=(forward and self.avatarControlForwardSpeed or
                     reverse and -self.avatarControlReverseSpeed)
diff --git a/direct/src/controls/NonPhysicsWalker.py b/direct/src/controls/NonPhysicsWalker.py
index 1bf8260603..719368c0b7 100755
--- a/direct/src/controls/NonPhysicsWalker.py
+++ b/direct/src/controls/NonPhysicsWalker.py
@@ -201,6 +201,12 @@ class NonPhysicsWalker(DirectObject.DirectObject):
         turnRight = inputState.isSet("turnRight")
         slide = inputState.isSet(self.slideName) or 0
         #jump = inputState.isSet("jump")
+        
+        # Check for Auto-Run
+        if base.localAvatar.getAutoRun():
+            forward = 1
+            reverse = 0
+                
         # Determine what the speeds are based on the buttons:
         self.speed=(forward and self.avatarControlForwardSpeed or
                     reverse and -self.avatarControlReverseSpeed)
diff --git a/direct/src/controls/PhysicsWalker.py b/direct/src/controls/PhysicsWalker.py
index e375a6b199..ca098701be 100755
--- a/direct/src/controls/PhysicsWalker.py
+++ b/direct/src/controls/PhysicsWalker.py
@@ -466,6 +466,12 @@ class PhysicsWalker(DirectObject.DirectObject):
         slideLeft = 0#inputState.isSet("slideLeft")
         slideRight = 0#inputState.isSet("slideRight")
         jump = inputState.isSet("jump")
+        
+        # Check for Auto-Run
+        if base.localAvatar.getAutoRun():
+            forward = 1
+            reverse = 0
+                
         # Determine what the speeds are based on the buttons:
         self.__speed=(forward and self.avatarControlForwardSpeed or
                 reverse and -self.avatarControlReverseSpeed)
diff --git a/direct/src/controls/SwimWalker.py b/direct/src/controls/SwimWalker.py
index 9ea12a9e2f..03ba0a97ec 100755
--- a/direct/src/controls/SwimWalker.py
+++ b/direct/src/controls/SwimWalker.py
@@ -11,6 +11,12 @@ class SwimWalker(NonPhysicsWalker.NonPhysicsWalker):
         reverse = inputState.isSet("reverse")
         turnLeft = inputState.isSet("turnLeft") or inputState.isSet("slideLeft")
         turnRight = inputState.isSet("turnRight") or inputState.isSet("slideRight")
+
+        # Check for Auto-Run
+        if base.localAvatar.getAutoRun():
+            forward = 1
+            reverse = 0
+        
         # Determine what the speeds are based on the buttons:
         self.speed=(forward and self.avatarControlForwardSpeed or
                     reverse and -self.avatarControlReverseSpeed)