corrected email field validation, fixes #1994
Merge pull request #1996 from yzlow/3.0-unstable

corrected email field validation, fixes #1994