Properly ask for email and don't stash before provisioning.