Honor validate on save