Improved Log in/out experience