Index: openacs-4/packages/xowiki/tcl/form-field-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/form-field-procs.tcl,v
diff -u -r1.196 -r1.197
--- openacs-4/packages/xowiki/tcl/form-field-procs.tcl	25 Dec 2011 15:54:49 -0000	1.196
+++ openacs-4/packages/xowiki/tcl/form-field-procs.tcl	27 Dec 2011 14:19:55 -0000	1.197
@@ -79,18 +79,20 @@
   #  return [string map [list __COLON__ :] $string]
   #}
 
-  FormField proc get_from_name {name} {
+  FormField proc get_from_name {object name} {
     #
     # Get a form field via name. The provided names are unique for a
     # form. If multiple forms should be rendered simultaneously, we
     # have to extend the addressing mechanism.
     #
     # todo: we could speed this up by an index if needed
     foreach f [::xowiki::formfield::FormField info instances -closure] {
-      if {[$f name] eq $name} {
+      if {[$f name] eq $name && $object eq [$f object]} {
+	#my msg FOUND-$object-$name->$f
 	return $f
       }
     }
+    #my msg not-found-$object-$name
     return ""
   }
 
Index: openacs-4/packages/xowiki/tcl/xowiki-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-procs.tcl,v
diff -u -r1.448 -r1.449
--- openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	23 Dec 2011 11:25:12 -0000	1.448
+++ openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	27 Dec 2011 14:19:55 -0000	1.449
@@ -3428,7 +3428,7 @@
       #
       # First check to find an existing form-field with that name
       #
-      set f [::xowiki::formfield::FormField get_from_name $varname]
+      set f [::xowiki::formfield::FormField get_from_name [self] $varname]
       if {$f ne ""} {
 	#
 	# the form field exists already, we just fill in the actual