diff --git a/config/alfresco/web-client-application-context.xml b/config/alfresco/web-client-application-context.xml
index 93baa5784f..be9061cf12 100644
--- a/config/alfresco/web-client-application-context.xml
+++ b/config/alfresco/web-client-application-context.xml
@@ -164,7 +164,7 @@
    <!--  Alfresco Web Client Authenticator (Servlet based) -->
    <bean id="webscripts.authenticator.webclient" class="org.alfresco.repo.web.scripts.servlet.WebClientAuthenticatorFactory" />
    
-   <bean id="webscripts.authenticator.jsr168.webclient" class="org.alfresco.repo.web.scripts.portlet.WebClientPortletAuthenticatorFactory">
+   <bean id="webscripts.authenticator.jsr168.webclient" class="org.alfresco.repo.web.scripts.portlet.WebClientPortletAuthenticatorFactory" lazy-init="true">
       <property name="repository" ref="repositoryHelper" />
       <property name="authenticationService" ref="AuthenticationService" />
       <property name="transactionService" ref="TransactionService" />
diff --git a/source/java/org/alfresco/web/app/servlet/FacesHelper.java b/source/java/org/alfresco/web/app/servlet/FacesHelper.java
index f15847afcd..f916f0e3f8 100644
--- a/source/java/org/alfresco/web/app/servlet/FacesHelper.java
+++ b/source/java/org/alfresco/web/app/servlet/FacesHelper.java
@@ -33,9 +33,6 @@ import javax.faces.el.EvaluationException;
 import javax.faces.el.ValueBinding;
 import javax.faces.lifecycle.Lifecycle;
 import javax.faces.lifecycle.LifecycleFactory;
-import javax.portlet.PortletContext;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletResponse;
 import javax.servlet.ServletContext;
 import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
@@ -105,13 +102,13 @@ public final class FacesHelper
     * Return a valid FacesContext for the specific context, request and response.
     * The FacesContext can be constructor for Servlet use.
     * 
-    * @param context       ServletContext
-    * @param request       ServletRequest
-    * @param response      ServletReponse
+    * @param context       PortletContext
+    * @param request       PortletRequest
+    * @param response      PortletResponse
     * 
     * @return FacesContext
     */
-   public static FacesContext getFacesContext(PortletRequest request, PortletResponse response, PortletContext context)
+   public static FacesContext getFacesContext(Object request, Object response, Object context)
    {
       return getFacesContextImpl(request, response, context, null);
    }
diff --git a/source/java/org/alfresco/web/bean/users/MailInviteSpaceUsersWizard.java b/source/java/org/alfresco/web/bean/users/MailInviteSpaceUsersWizard.java
index 3fd0e64b5a..851e058e53 100755
--- a/source/java/org/alfresco/web/bean/users/MailInviteSpaceUsersWizard.java
+++ b/source/java/org/alfresco/web/bean/users/MailInviteSpaceUsersWizard.java
@@ -26,6 +26,7 @@ package org.alfresco.web.bean.users;
 
 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;
@@ -42,7 +43,7 @@ public class MailInviteSpaceUsersWizard extends InviteSpaceUsersWizard
         // groups - text search match on supplied name
         String term = PermissionService.GROUP_PREFIX + "*" + search + "*";
         Set<String> groups;
-        groups = getAuthorityService().findAuthorities(AuthorityType.GROUP, term);
+        groups = getAuthorityService().findAuthoritiesInZone(AuthorityType.GROUP, 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 861a2cf5cc..a74b881b7c 100644
--- a/source/java/org/alfresco/web/bean/wcm/SetPermissionsDialog.java
+++ b/source/java/org/alfresco/web/bean/wcm/SetPermissionsDialog.java
@@ -279,7 +279,7 @@ public class SetPermissionsDialog extends UpdatePermissionsDialog
                 // groups - text search match on supplied name
                 String term = PermissionService.GROUP_PREFIX + "*" + contains.trim() + "*";
                 Set<String> groups;
-                groups = getAuthorityService().findAuthorities(AuthorityType.GROUP, term);
+                groups = getAuthorityService().findAuthoritiesInZone(AuthorityType.GROUP, 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 2a489802a1..2c36ce2359 100644
--- a/source/java/org/alfresco/web/bean/wizard/BaseInviteUsersWizard.java
+++ b/source/java/org/alfresco/web/bean/wizard/BaseInviteUsersWizard.java
@@ -571,7 +571,7 @@ public abstract class BaseInviteUsersWizard extends BaseWizardBean
        // groups - text search match on supplied name
        String term = PermissionService.GROUP_PREFIX + "*" + search + "*";
        Set<String> groups;
-       groups = getAuthorityService().findAuthorities(AuthorityType.GROUP, term);
+       groups = getAuthorityService().findAuthoritiesInZone(AuthorityType.GROUP, term, AuthorityService.ZONE_APP_DEFAULT);
        groups.addAll(getAuthorityService().getAllAuthorities(AuthorityType.EVERYONE));
        return groups;
    }