Added email validation checks