diff --git a/config/alfresco/action-services-context.xml b/config/alfresco/action-services-context.xml
index 37c03ec642..79b36a8294 100644
--- a/config/alfresco/action-services-context.xml
+++ b/config/alfresco/action-services-context.xml
@@ -28,7 +28,7 @@
     		<ref bean="transactionComponent"/>
     	</property>
     	<property name="authenticationComponent">
-    		<ref bean="authenticationComponent"/>
+    		<ref bean="AuthenticationComponent"/>
     	</property>
     </bean>
 
diff --git a/config/alfresco/authentication-services-context.xml b/config/alfresco/authentication-services-context.xml
index 8694b6d5df..59bf276995 100644
--- a/config/alfresco/authentication-services-context.xml
+++ b/config/alfresco/authentication-services-context.xml
@@ -130,6 +130,23 @@
 
     <!-- The authentication component.                                      -->
 
+    <bean id="AuthenticationComponent" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
+        <property name="proxyInterfaces">
+            <value>org.alfresco.repo.security.authentication.AuthenticationComponent</value>
+        </property>
+        <property name="transactionManager">
+            <ref bean="transactionManager" />
+        </property>
+        <property name="target">
+            <ref bean="authenticationComponent" />
+        </property>
+        <property name="transactionAttributes">
+            <props>
+                <prop key="*">${server.transaction.mode.default}</prop>
+            </props>
+        </property>
+    </bean>
+    
     <alias name="authenticationComponent" alias="authenticationComponentImpl"/>  <!-- TODO: Remove -->
     <bean id="authenticationComponent" class="org.alfresco.repo.security.authentication.AuthenticationComponentImpl">
         <property name="authenticationDao">