Fixing email population.