Fix email validator bug #485

Fix email validator
Merge branch 'dmitrykakunin-email-validator-bug' into develop (#489)