Fix client side validation

Dieter Holvoetrequested to merge
issue/chosen-3409490:3409490-client-side-validation-broken-with into 4.0.x

Closes #3409490

Merge request reports