Fix issue with email validation