Login/Logout updated