Login-Logout refinements