Corrected EmailValidator