Tighten email check again