Refs #2491. Combined new and old email validation functions.