Improve sign-in-out