Fixed field values not being preserved when form fails