Index: openacs-4/packages/xowiki/tcl/package-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/package-procs.tcl,v
diff -u -N -r1.332.2.63 -r1.332.2.64
--- openacs-4/packages/xowiki/tcl/package-procs.tcl	20 Aug 2020 17:03:39 -0000	1.332.2.63
+++ openacs-4/packages/xowiki/tcl/package-procs.tcl	26 Aug 2020 18:35:00 -0000	1.332.2.64
@@ -951,10 +951,9 @@
 
   Package instproc make_form_link {-form {-parent_id ""} {-query ""} -title -name -nls_language -return_url} {
     # use the same instantiate_forms as everywhere; TODO: will go to a different namespace
-    set form_id [lindex [::xowiki::Weblog instantiate_forms \
+    set form_id [lindex [::${:id} instantiate_forms \
                              -parent_id $parent_id \
-                             -forms $form \
-                             -package_id ${:id}] 0]
+                             -forms $form] 0]
     #:log "instantiate_forms -parent_id $parent_id -forms $form => $form_id "
     if {$form_id ne ""} {
       if {$parent_id eq ""} {unset parent_id}
@@ -2182,7 +2181,7 @@
             error "trying to create an xowiki root folder for non-xowiki package ${:id}"
           } else {
             ::xowiki::Package require_site_wide_pages
-            set form_id [::xowiki::Weblog instantiate_forms -forms en:folder.form -package_id ${:id}]
+            set form_id [::${:id} instantiate_forms -forms en:folder.form]
             set f [FormPage new -destroy_on_cleanup \
                        -name $name \
                        -text "" \