fix handling of form provided default values.