Merge "Accept alternative email addresses."