Fixed email adress validation
Merge branch 'hotfix/fixed-invalid-email'
Merge branch 'master' into develop