diff --git a/source/java/org/alfresco/web/bean/users/MailInviteSpaceUsersWizard.java b/source/java/org/alfresco/web/bean/users/MailInviteSpaceUsersWizard.java
index 8eff125a17..581ea054d7 100644
--- a/source/java/org/alfresco/web/bean/users/MailInviteSpaceUsersWizard.java
+++ b/source/java/org/alfresco/web/bean/users/MailInviteSpaceUsersWizard.java
@@ -22,7 +22,6 @@ import java.util.Set;
 
 import org.alfresco.service.cmr.security.AuthorityService;
 import org.alfresco.service.cmr.security.AuthorityType;
-import org.alfresco.service.cmr.security.PermissionService;
 import org.alfresco.web.bean.spaces.InviteSpaceUsersWizard;
 
 /**
@@ -35,9 +34,10 @@ public class MailInviteSpaceUsersWizard extends InviteSpaceUsersWizard
     protected Set<String> getGroups(String search)
     {
         // groups - text search match on supplied name
-        String term = PermissionService.GROUP_PREFIX + "*" + search + "*";
+        String term = "*" + search + "*";
         Set<String> groups;
-        groups = getAuthorityService().findAuthoritiesInZone(AuthorityType.GROUP, term, AuthorityService.ZONE_APP_DEFAULT);
+        groups = getAuthorityService().findAuthorities(AuthorityType.GROUP, null, false, term,
+                AuthorityService.ZONE_APP_DEFAULT);
         return groups;
     }
 }
\ No newline at end of file
diff --git a/source/java/org/alfresco/web/bean/wcm/SetPermissionsDialog.java b/source/java/org/alfresco/web/bean/wcm/SetPermissionsDialog.java
index 5f7b3c2a4a..4fde3a2ff0 100644
--- a/source/java/org/alfresco/web/bean/wcm/SetPermissionsDialog.java
+++ b/source/java/org/alfresco/web/bean/wcm/SetPermissionsDialog.java
@@ -286,9 +286,9 @@ public class SetPermissionsDialog extends UpdatePermissionsDialog
             else
             {
                 // groups - text search match on supplied name
-                String term = PermissionService.GROUP_PREFIX + "*" + contains.trim() + "*";
+                String term = "*" + contains.trim() + "*";
                 Set<String> groups;
-                groups = getAuthorityService().findAuthoritiesInZone(AuthorityType.GROUP, term, AuthorityService.ZONE_APP_DEFAULT);
+                groups = getAuthorityService().findAuthorities(AuthorityType.GROUP, null, false, term, AuthorityService.ZONE_APP_DEFAULT);
                 groups.addAll(getAuthorityService().getAllAuthorities(AuthorityType.EVERYONE));
 
                 String groupDisplayName;
diff --git a/source/java/org/alfresco/web/bean/wizard/BaseInviteUsersWizard.java b/source/java/org/alfresco/web/bean/wizard/BaseInviteUsersWizard.java
index 7f41a6c02f..95bf87da1d 100644
--- a/source/java/org/alfresco/web/bean/wizard/BaseInviteUsersWizard.java
+++ b/source/java/org/alfresco/web/bean/wizard/BaseInviteUsersWizard.java
@@ -63,7 +63,6 @@ import org.alfresco.web.ui.common.Utils;
 import org.alfresco.web.ui.common.component.UIGenericPicker;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.lucene.queryParser.QueryParser;
 import org.apache.lucene.search.BooleanQuery;
 import org.springframework.mail.javamail.JavaMailSender;
 
@@ -563,9 +562,10 @@ public abstract class BaseInviteUsersWizard extends BaseWizardBean
    protected Set<String> getGroups(String search)
    {
        // groups - text search match on supplied name
-       String term = PermissionService.GROUP_PREFIX + "*" + search + "*";
+       String term = "*" + search + "*";
        Set<String> groups;
-       groups = getAuthorityService().findAuthoritiesInZone(AuthorityType.GROUP, term, AuthorityService.ZONE_APP_DEFAULT);
+       groups = getAuthorityService().findAuthorities(AuthorityType.GROUP, null, false, term,
+                AuthorityService.ZONE_APP_DEFAULT);
        groups.addAll(getAuthorityService().getAllAuthorities(AuthorityType.EVERYONE));
        return groups;
    }