Fixes: #1859 Changed email validation system