Tighten email check logic a little