Added email check