Improvements to sign in/sign out feature