Maybe I should move this to before submit and just update the fields before saving...