Index: openacs-4/packages/acs-subsite/www/members/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/members/index.tcl,v
diff -u -N -r1.20.2.3 -r1.20.2.4
--- openacs-4/packages/acs-subsite/www/members/index.tcl	13 Jun 2016 10:47:10 -0000	1.20.2.3
+++ openacs-4/packages/acs-subsite/www/members/index.tcl	17 Jun 2016 09:59:43 -0000	1.20.2.4
@@ -160,11 +160,11 @@
     } -orderby {
         name {
             label "[_ acs-subsite.Name]"
-            orderby "lower(u.first_names || ' ' || u.last_name)"
+            orderby "lower(p.first_names || ' ' || p.last_name)"
         }
         email {
             label "[_ acs-subsite.Email]"
-            orderby "u.email"
+            orderby "pa.email"
         }
     }
 
Index: openacs-4/packages/acs-subsite/www/members/index.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/members/index.xql,v
diff -u -N -r1.4 -r1.4.14.1
--- openacs-4/packages/acs-subsite/www/members/index.xql	22 Jul 2005 00:33:07 -0000	1.4
+++ openacs-4/packages/acs-subsite/www/members/index.xql	17 Jun 2016 09:59:43 -0000	1.4.14.1
@@ -6,14 +6,16 @@
       <querytext>
       
     select r.rel_id, 
-           u.first_names || ' ' || u.last_name as name
+           p.first_names || ' ' || p.last_name as name
     from   acs_rels r,
            membership_rels mr,
-           cc_users u
+           persons p,
+           parties pa
     where  r.object_id_one = :group_id
     and    r.rel_type = 'membership_rel'
     and    mr.rel_id = r.rel_id
-    and    u.user_id = r.object_id_two
+    and    p.person_id = r.object_id_two
+    and    p.person_id = pa.party_id
     [template::list::filter_where_clauses -and -name "members"]
     [template::list::orderby_clause -orderby -name "members"]
 	
@@ -36,30 +38,32 @@
       <querytext>
 
     select r.rel_id, 
-           u.user_id,
-           u.first_names || ' ' || u.last_name as name,
-           u.email,
+           p.person_id as user_id,
+           p.first_names || ' ' || p.last_name as name,
+           pa.email,
            mr.member_state,
            (select count(*)
             from rel_segment_party_map
             where rel_type = 'admin_rel'
               and group_id = :group_id
-              and party_id = u.user_id) as member_admin_p,
+              and party_id = pa.party_id) as member_admin_p,
            (select distinct r.pretty_name 
             from acs_rel_roles r, rel_segment_party_map m, acs_rel_types t
             where m.group_id = :group_id
             and t.rel_type = m.rel_type
             and m.rel_type <> 'admin_rel'
             and m.rel_type <> 'membership_rel'
             and r.role = t.role_two
-            and m.party_id = u.user_id) as other_role_pretty
+            and m.party_id = pa.party_id) as other_role_pretty
     from   acs_rels r,
            membership_rels mr,
-           cc_users u
+           persons p,
+           parties pa
     where  r.object_id_one = :group_id
     and    mr.rel_id = r.rel_id
     and    r.rel_id = mr.rel_id
-    and    u.user_id = r.object_id_two
+    and    p.person_id = r.object_id_two
+    and    p.person_id = pa.party_id
     [template::list::filter_where_clauses -and -name "members"]
     [template::list::page_where_clause -and -name "members" -key "r.rel_id"]
     [template::list::orderby_clause -orderby -name "members"]