Add additional email check