diff --git a/config/alfresco/content-services-context.xml b/config/alfresco/content-services-context.xml
index 09201b08cd..a230559c59 100644
--- a/config/alfresco/content-services-context.xml
+++ b/config/alfresco/content-services-context.xml
@@ -70,7 +70,7 @@
           <ref bean="policyComponent" />
       </property>
       <property name="avmService">
-          <ref bean="AVMService"/>
+          <ref bean="avmService"/>
       </property>
       <property name="imageMagickContentTransformer">
          <ref bean="transformer.ImageMagick" />
diff --git a/source/java/org/alfresco/repo/avm/AVMContext.java b/source/java/org/alfresco/repo/avm/AVMContext.java
index ba294be1b1..871dbd984f 100644
--- a/source/java/org/alfresco/repo/avm/AVMContext.java
+++ b/source/java/org/alfresco/repo/avm/AVMContext.java
@@ -289,7 +289,7 @@ public class AVMContext implements ApplicationContextAware
     {
         if (fAuthenticationComponent == null)
         {
-            fAuthenticationComponent = (AuthenticationComponent)fAppContext.getBean("authenticationComponent");
+            fAuthenticationComponent = (AuthenticationComponent)fAppContext.getBean("authenticationComponentImpl");
         }
         return fAuthenticationComponent;
     }