Index: openacs-4/packages/acs-authentication/tcl/authentication-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-authentication/tcl/authentication-procs.tcl,v
diff -u -N -r1.89.2.4 -r1.89.2.5
--- openacs-4/packages/acs-authentication/tcl/authentication-procs.tcl	2 Jan 2016 13:55:18 -0000	1.89.2.4
+++ openacs-4/packages/acs-authentication/tcl/authentication-procs.tcl	5 Jul 2016 16:39:24 -0000	1.89.2.5
@@ -1684,17 +1684,23 @@
 
     @author Peter Marklund
 } {
+    #
+    # Count all users from other authorities having swa admins (having
+    # admin rights on the magic object 'security_context_root').
+    #
     set number_of_admins_left [db_string count_admins_left {
-        select count(*)
-        from cc_users u,
-             acs_object_party_privilege_map pm,
-             acs_magic_objects mo
-        where authority_id <> :authority_id
-        and pm.privilege = 'admin'
-        and pm.object_id = mo.object_id
-        and mo.name = 'security_context_root'
-        and pm.party_id = u.user_id
-        and u.member_state = 'approved'
+       select count(*)
+	   from acs_permissions p,
+	        party_approved_member_map m,
+	        acs_magic_objects amo,
+	        cc_users u
+	   where amo.name = 'security_context_root'
+	     and p.object_id = amo.object_id
+	     and p.grantee_id = m.party_id
+	     and u.user_id = m.member_id
+	     and u.member_state = 'approved'
+	     and u.authority_id <> :authority_id
+	     and acs_permission.permission_p(amo.object_id, u.user_id, 'admin')
     }]
 
     return [ad_decode $number_of_admins_left "0" "0" "1"]