WIP: Use actual email address in onboarding instead of a button