Index: openacs-4/packages/acs-subsite/www/admin/group-types/one.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/group-types/one.tcl,v
diff -u -r1.7.2.3 -r1.7.2.4
--- openacs-4/packages/acs-subsite/www/admin/group-types/one.tcl	2 Jan 2016 13:47:26 -0000	1.7.2.3
+++ openacs-4/packages/acs-subsite/www/admin/group-types/one.tcl	10 Jun 2016 12:10:04 -0000	1.7.2.4
@@ -62,7 +62,9 @@
 # See if we need to offer a link to add a rel type
 set more_relation_types_p [rel_types::additional_rel_types_p -group_type $group_type]
 
-set add_group_url [export_vars -base "../parties/new" {{party_type $group_type} {add_with_rel_type composition_rel} return_url}]
+set add_group_url [export_vars -base "../groups/new" {
+    {group_type $group_type} {add_with_rel_type composition_rel} return_url
+}]
 
 set add_attribute_url [export_vars -base "../attributes/add" {{object_type $group_type} return_url}]
 
Index: openacs-4/packages/acs-subsite/www/admin/groups/new.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/groups/new.tcl,v
diff -u -r1.10.2.4 -r1.10.2.5
--- openacs-4/packages/acs-subsite/www/admin/groups/new.tcl	20 May 2016 20:02:44 -0000	1.10.2.4
+++ openacs-4/packages/acs-subsite/www/admin/groups/new.tcl	10 Jun 2016 12:10:04 -0000	1.10.2.5
@@ -125,12 +125,20 @@
 
 if { [template::form is_valid add_group] } {
     db_transaction {
-	group::new -form_id add_group -variable_prefix group -group_id $group_id -context_id [ad_conn package_id] $group_type 
-	relation_add -member_state $member_state $add_with_rel_type $add_to_group_id $group_id
+	set group_id [group::new \
+                          -form_id add_group \
+                          -variable_prefix group \
+                          -group_id $group_id \
+                          -context_id [ad_conn package_id] \
+                          $group_type]
+        relation_add -member_state $member_state $add_with_rel_type $add_to_group_id $group_id
     }
 
-    # there may be more segments to put this new group in before the
-    # user's original request is complete.   So build a return_url stack
+    #
+    # There may be more segments to put this new group in before the
+    # user's original request is complete.  So build a return_url
+    # stack.
+    #
     set package_url [ad_conn package_url]
 
     foreach group_rel_type $group_rel_type_list {