Fixed issue #7278: Completing survey from pre-existing token fails on final submit