Email validations now happen correctly