Fix user email address population.