Fix Log out/Log in consistency