Further additions to sign-in/out