Fixed Login/LogOut