Login/Logout simplification