Make sign-in/create account consistent