=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserCredentials.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserCredentials.java 2011-06-11 19:51:41 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserCredentials.java 2011-06-13 18:34:18 +0000 @@ -97,14 +97,19 @@ */ public boolean canIssue( UserAuthorityGroup group ) { - if ( group == null || userAuthorityGroups.contains( group ) ) + if ( group == null ) { return false; } - + final Set authorities = getAllAuthorities(); - return ( authorities.contains( UserAuthorityGroup.AUTHORITY_ALL ) || authorities.containsAll( group.getAuthorities() ) ); + if ( authorities.contains( UserAuthorityGroup.AUTHORITY_ALL ) ) + { + return true; + } + + return !userAuthorityGroups.contains( group ) && authorities.containsAll( group.getAuthorities() ); } // -------------------------------------------------------------------------