Fix LogIn/LogOut