Fixed Login/Logout