diff --git a/config/alfresco/authentication-services-context.xml b/config/alfresco/authentication-services-context.xml
index 452776e67d..ebc880890a 100644
--- a/config/alfresco/authentication-services-context.xml
+++ b/config/alfresco/authentication-services-context.xml
@@ -147,8 +147,17 @@
             </props>
         </property>
     </bean>
-
-    <bean id="authenticationComponent" class="org.alfresco.repo.security.authentication.AuthenticationComponentImpl">
+
+    <!-- Parent bean for beans derived from AbstractAuthenticationComponent -->
+    <bean id="authenticationComponentBase" abstract="true">
+       <property name="tenantService">
+            <ref bean="tenantService"/>
+        </property>
+    </bean>
+   
+    <bean id="authenticationComponent"
+          class="org.alfresco.repo.security.authentication.AuthenticationComponentImpl" 
+          parent="authenticationComponentBase">
         <property name="authenticationDao">
             <ref bean="authenticationDao" />
         </property>
@@ -157,9 +166,6 @@
         </property>
         <property name="allowGuestLogin">
             <value>true</value>
-        </property>
-        <property name="tenantService">
-            <ref bean="tenantService"/>
         </property>
     </bean>
 
@@ -169,7 +175,9 @@
     <!-- It should never go to the login screen  so this is not required          -->
 
     <!--
-    <bean id="authenticationComponent" class="org.alfresco.repo.security.authentication.SimpleAcceptOrRejectAllAuthenticationComponentImpl">
+    <bean id="authenticationComponent"
+          class="org.alfresco.repo.security.authentication.SimpleAcceptOrRejectAllAuthenticationComponentImpl"
+          parent="authenticationComponentBase">
         <property name="accept">
             <value>true</value>
         </property>
diff --git a/config/alfresco/extension/jaas-authentication-context.xml.sample b/config/alfresco/extension/jaas-authentication-context.xml.sample
index e4d8b6a0e4..7960f98a9a 100644
--- a/config/alfresco/extension/jaas-authentication-context.xml.sample
+++ b/config/alfresco/extension/jaas-authentication-context.xml.sample
@@ -6,8 +6,9 @@
 
     <!-- Jass authentication - most of the config goes somewhere else       -->
        
-    <bean id="authenticationComponent" 
-                 class="org.alfresco.repo.security.authentication.jaas.JAASAuthenticationComponent">
+    <bean id="authenticationComponent"
+          class="org.alfresco.repo.security.authentication.jaas.JAASAuthenticationComponent"
+          parent="authenticationComponentBase">
         <property name="realm">
             <value>DEFAULT.REALM</value>
         </property>
diff --git a/config/alfresco/extension/ldap-authentication-context.xml.sample b/config/alfresco/extension/ldap-authentication-context.xml.sample
index 9830dba432..24d5afc070 100644
--- a/config/alfresco/extension/ldap-authentication-context.xml.sample
+++ b/config/alfresco/extension/ldap-authentication-context.xml.sample
@@ -33,7 +33,9 @@
     
     -->
     
-    <bean id="authenticationComponent" class="org.alfresco.repo.security.authentication.ldap.LDAPAuthenticationComponentImpl">
+    <bean id="authenticationComponent"
+          class="org.alfresco.repo.security.authentication.ldap.LDAPAuthenticationComponentImpl" 
+          parent="authenticationComponentBase">
         <property name="LDAPInitialDirContextFactory">
             <ref bean="ldapInitialDirContextFactory"/>
         </property>
diff --git a/config/alfresco/extension/ntlm-authentication-context.xml.sample b/config/alfresco/extension/ntlm-authentication-context.xml.sample
index 31d8db7100..2326c81bf3 100644
--- a/config/alfresco/extension/ntlm-authentication-context.xml.sample
+++ b/config/alfresco/extension/ntlm-authentication-context.xml.sample
@@ -17,7 +17,9 @@
     <!--   servers          comma delimted list of server addresses or      -->
     <!--                    names                                           -->
        
-    <bean id="authenticationComponent" class="org.alfresco.repo.security.authentication.ntlm.NTLMAuthenticationComponentImpl">
+    <bean id="authenticationComponent"
+          class="org.alfresco.repo.security.authentication.ntlm.NTLMAuthenticationComponentImpl"
+          parent="authenticationComponentBase">
         <property name="useLocalServer">
             <value>true</value>
         </property>