Follow-up for bug#10639. Also accept DefaultValue of StateID field.