Cleaned up the experience for email registration to happen first