fixup! Fix bug 939112: Newsletter form choices only supported.