diff --git a/modules/game_cooldown/cooldown.lua b/modules/game_cooldown/cooldown.lua
index 48b6ce93..b6c37372 100644
--- a/modules/game_cooldown/cooldown.lua
+++ b/modules/game_cooldown/cooldown.lua
@@ -61,7 +61,7 @@ function online()
     cooldownWindow:close()
   end
 
-  if lastPlayer ~= g_game.getCharacterName() then
+  if not lastPlayer or lastPlayer ~= g_game.getCharacterName() then
     refresh()
     lastPlayer = g_game.getCharacterName()
   end
diff --git a/src/client/game.cpp b/src/client/game.cpp
index c6c2b215..997e66cb 100644
--- a/src/client/game.cpp
+++ b/src/client/game.cpp
@@ -627,7 +627,7 @@ void Game::autoWalk(std::vector<Otc::Direction> dirs)
     Otc::Direction direction = *it;
     if(m_localPlayer->canWalk(direction)) {
         TilePtr toTile = g_map.getTile(m_localPlayer->getPosition().translatedToDirection(direction));
-        if(toTile && toTile->isWalkable() && !m_localPlayer->isAutoWalking()) {
+        if(toTile && toTile->isWalkable() && !m_localPlayer->isServerWalking()) {
             m_localPlayer->preWalk(direction);
 
             if(getFeature(Otc::GameForceFirstAutoWalkStep)) {