Fixed issue #8410: Save fails on final submit for token with participant_id