Index: openacs-4/packages/contacts/www/contact-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/contact-add.tcl,v
diff -u -r1.36 -r1.37
--- openacs-4/packages/contacts/www/contact-add.tcl	12 Oct 2005 20:37:09 -0000	1.36
+++ openacs-4/packages/contacts/www/contact-add.tcl	28 Oct 2005 21:17:02 -0000	1.37
@@ -72,12 +72,16 @@
     -edit_buttons [list [list "[_ acs-kernel.common_Save]" save] ]\
     -form $form_elements
 
+# List to get the elements to the form
+set list_names [list]
+
 foreach group $group_list {
     set group_id [lindex $group 1]
     if { [lsearch $group_ids $group_id] >= 0 } {
-
-	ad_form -extend -name party_ae -form [ams::ad_form::elements -package_key "contacts" -object_type $object_type -list_name "${package_id}__${group_id}"]
 	
+	# Adding the list_name to get the elements in the form
+	lappend list_names [list ${package_id}__${group_id}]
+
 	# Add the category widget(s)
 	set element_name "category_ids$group_id"
 	if {$group_id < 0} {
@@ -93,6 +97,13 @@
     }
 }
 
+# Creating the form
+ad_form -extend -name party_ae -form [ams::ad_form::elements \
+					  -package_key "contacts" \
+					  -object_type $object_type \
+					  -list_names $list_names]
+
+
 # Append relationship attributes
 
 if {[exists_and_not_null role_two]} {
Index: openacs-4/packages/contacts/www/contact-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/contact-edit.tcl,v
diff -u -r1.13 -r1.14
--- openacs-4/packages/contacts/www/contact-edit.tcl	6 Oct 2005 22:26:52 -0000	1.13
+++ openacs-4/packages/contacts/www/contact-edit.tcl	28 Oct 2005 21:17:02 -0000	1.14
@@ -37,11 +37,9 @@
     }
 }
 
-foreach form $ams_forms {
-    append form_elements " "
-    append form_elements [ams::ad_form::elements -package_key "contacts" -object_type $object_type -list_name $form]
-}
 
+append form_elements " [ams::ad_form::elements -package_key "contacts" -object_type $object_type -list_names $ams_forms]"
+
 ad_form -name party_ae \
     -mode "edit" \
     -form $form_elements \