diff --git a/config/alfresco/subsystems/Authentication/alfrescoNtlm/ntlm-filter-context.xml b/config/alfresco/subsystems/Authentication/alfrescoNtlm/ntlm-filter-context.xml
index be8320d530..0e9d4090f9 100644
--- a/config/alfresco/subsystems/Authentication/alfrescoNtlm/ntlm-filter-context.xml
+++ b/config/alfresco/subsystems/Authentication/alfrescoNtlm/ntlm-filter-context.xml
@@ -102,6 +102,9 @@
       <property name="mapUnknownUserToGuest">
          <value>${ntlm.authentication.mapUnknownUserToGuest}</value>
       </property>
+      <property name="remoteUserMapper">
+         <ref bean="RemoteUserMapper" />
+      </property>
    </bean>
 
    <bean id="sharepointAuthenticationHandler" class="org.alfresco.web.sharepoint.auth.ntlm.NtlmAuthenticationHandler">
diff --git a/source/web/WEB-INF/web.xml b/source/web/WEB-INF/web.xml
index 83689caf7b..04209ba9b9 100644
--- a/source/web/WEB-INF/web.xml
+++ b/source/web/WEB-INF/web.xml
@@ -327,12 +327,7 @@
    </filter-mapping>
 
    <filter-mapping>
-      <filter-name>Global Authentication Filter</filter-name>
-      <url-pattern>/cmisatom/*</url-pattern>
-   </filter-mapping>
-
-   <filter-mapping>
-      <filter-name>Authentication Filter</filter-name>
+      <filter-name>WebDAV Authentication Filter</filter-name>
       <url-pattern>/cmisatom/*</url-pattern>
    </filter-mapping>