Add email matching, reject invalid emails