diff --git a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/membership/potentialmembers.get.js b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/membership/potentialmembers.get.js
index daa253a7d7..43d46918e9 100644
--- a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/membership/potentialmembers.get.js
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/membership/potentialmembers.get.js
@@ -3,7 +3,7 @@ function main()
    // Get the args
    var siteShortName = url.templateArgs.shortname,
       site = siteService.getSite(siteShortName),
-      filter = (args.filter != null) ? args.filter : (args.shortNameFilter != null) ? args.shortNameFilter : "",
+      filter = (args.filter != null) ? args.filter + " [hint:useCQ]" : (args.shortNameFilter != null) ? args.shortNameFilter : "",
       maxResults = (args.maxResults == null) ? 10 : parseInt(args.maxResults, 10),
       authorityType = args.authorityType,
       zone = args.zone,
diff --git a/repository/src/main/java/org/alfresco/repo/jscript/People.java b/repository/src/main/java/org/alfresco/repo/jscript/People.java
index 6d88de1339..813e6ac3b8 100644
--- a/repository/src/main/java/org/alfresco/repo/jscript/People.java
+++ b/repository/src/main/java/org/alfresco/repo/jscript/People.java
@@ -581,9 +581,17 @@ public class People extends BaseScopableProcessorExtension implements Initializi
     protected List<PersonInfo> getPeopleImpl(String filter, ScriptPagingDetails pagingRequest, String sortBy, Boolean sortAsc)
     {
         ParameterCheck.mandatory("pagingRequest", pagingRequest);
-        
-        boolean useCQ = honorHintUseCQ;
-        if (filter == null)
+
+        boolean useCQ = false;
+        if (filter != null)
+        {
+            if (filter.endsWith(HINT_CQ_SUFFIX))
+            {
+                useCQ = honorHintUseCQ;
+                filter = filter.substring(0, filter.length()-HINT_CQ_SUFFIX.length());
+            }
+        }
+        else
         {
             filter = "*";
         }