Fix global category create / edit forms (fixup of #695)