diff --git a/config/alfresco/extension/chaining-authentication-context.xml.sample b/config/alfresco/extension/chaining-authentication-context.xml.sample
index 11d6af6f0d..e425016249 100644
--- a/config/alfresco/extension/chaining-authentication-context.xml.sample
+++ b/config/alfresco/extension/chaining-authentication-context.xml.sample
@@ -52,6 +52,9 @@
     <bean id="authenticationDaoAlfresco" class="org.alfresco.repo.security.authentication.RepositoryAuthenticationDao">
         <property name="nodeService">
             <ref bean="nodeService"/>
+        </property>
+        <property name="tenantService">
+            <ref bean="tenantService"/>
         </property>
         <property name="dictionaryService">
             <ref bean="dictionaryService"/>
@@ -73,7 +76,7 @@
         </property>
     </bean>
     
-    <bean id="authenticationComponentImplAlfresco" class="org.alfresco.repo.security.authentication.AuthenticationComponentImpl">
+    <bean id="authenticationComponentImplAlfresco" class="org.alfresco.repo.security.authentication.AuthenticationComponentImpl" parent="authenticationComponentBase">
         <property name="authenticationDao">
             <ref bean="authenticationDaoAlfresco"/>
         </property>