CLOUD-216 form validation fix