Logout: Fixed logout not working due to recent login changes