[#11815] Update form and post handling