Make email address more straightforward.