fix user email validation
merge changes