diff --git a/rm-community/rm-community-repo/config/alfresco/extension/subsystems/imap/default/default/rm-imap-server-context.xml b/rm-community/rm-community-repo/config/alfresco/extension/subsystems/imap/default/default/rm-imap-server-context.xml
index 50c97563ad..f30a9cb9b0 100644
--- a/rm-community/rm-community-repo/config/alfresco/extension/subsystems/imap/default/default/rm-imap-server-context.xml
+++ b/rm-community/rm-community-repo/config/alfresco/extension/subsystems/imap/default/default/rm-imap-server-context.xml
@@ -6,7 +6,7 @@
  <!-- Extend Imap Service -->
    <bean id="rm.imapService" abstract="true" class="org.alfresco.repo.imap.ExtendedImapServiceImpl">
       <property name="dictionaryService" ref="DictionaryService"/>
-      <property name="authenticationUtil" ref="AuthenticationUtil"/>
+      <property name="authenticationUtil" ref="rm.authenticationUtil"/>
    </bean>
    <bean class="org.alfresco.util.BeanExtender">
       <property name="beanName" value="imapService" />
diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/repo/imap/ExtendedImapServiceImpl.java b/rm-community/rm-community-repo/source/java/org/alfresco/repo/imap/ExtendedImapServiceImpl.java
index 7f1bcf315b..de5bd649aa 100644
--- a/rm-community/rm-community-repo/source/java/org/alfresco/repo/imap/ExtendedImapServiceImpl.java
+++ b/rm-community/rm-community-repo/source/java/org/alfresco/repo/imap/ExtendedImapServiceImpl.java
@@ -54,12 +54,19 @@ public class ExtendedImapServiceImpl extends ImapServiceImpl
         this.dictionaryService = dictionaryService;
     }
 
+    public void setAuthenticationUtil(AuthenticationUtil authenticationUtil)
+    {
+        this.authenticationUtil = authenticationUtil;
+    }
+
+    @Override
     public void setPolicyFilter(BehaviourFilter policyBehaviourFilter)
     {
         this.policyBehaviourFilter = policyBehaviourFilter;
         super.setPolicyFilter(policyBehaviourFilter);
     }
 
+    @Override
     public void setNodeService(NodeService nodeService)
     {
         this.nodeService = nodeService;