[1.6.x] Fixed an email validation regression

Thanks Vincent Wagelaar for the report.
Backport of 11b7b9ad from master.