[Form] Make form fields non-required