Update for changes to email format.