[Client] Improved resetting of moves