[#11815] Ensure id is set if submit handler not passed