Fixing Forms, to set required parameter only when true