diff --git a/modules/dcache-webdav/src/main/java/org/dcache/webdav/AnonymousUserLoginStrategy.java b/modules/dcache-webdav/src/main/java/org/dcache/webdav/AnonymousUserLoginStrategy.java
new file mode 100644
index 00000000000..9f61878ff68
--- /dev/null
+++ b/modules/dcache-webdav/src/main/java/org/dcache/webdav/AnonymousUserLoginStrategy.java
@@ -0,0 +1,94 @@
+package org.dcache.webdav;
+
+import org.springframework.beans.factory.annotation.Required;
+
+import javax.security.auth.Subject;
+
+import java.security.Principal;
+import java.util.Set;
+
+import diskCacheV111.util.CacheException;
+
+import org.dcache.auth.LoginNamePrincipal;
+import org.dcache.auth.LoginReply;
+import org.dcache.auth.LoginStrategy;
+import org.dcache.auth.PasswordCredential;
+import org.dcache.auth.Subjects;
+import org.dcache.auth.UnionLoginStrategy.AccessLevel;
+import org.dcache.auth.attributes.LoginAttribute;
+import org.dcache.auth.attributes.Restrictions;
+
+import static java.util.Collections.emptySet;
+import static java.util.Collections.singleton;
+import static java.util.Objects.requireNonNull;
+import static org.dcache.auth.UnionLoginStrategy.AccessLevel.READONLY;
+import static org.dcache.auth.UnionLoginStrategy.AccessLevel.NONE;
+
+/**
+ * Add support for logging in a particular user as Users.NOBODY, all other
+ * requests are passed on to some wrapped LoginStrategy.  If AccessLevel is NONE
+ * then all requests are passed onto the wrapped LoginStrategy.
+ */
+public class AnonymousUserLoginStrategy implements LoginStrategy
+{
+    private LoginStrategy _inner;
+    private String _username;
+    private AccessLevel _anonymousAccess = NONE;
+
+    public void setAnonymousAccess(AccessLevel level)
+    {
+        _anonymousAccess = requireNonNull(level);
+    }
+
+    public AccessLevel getAnonymousAccess()
+    {
+        return _anonymousAccess;
+    }
+
+    @Required
+    public void setNonAnonymousStrategy(LoginStrategy strategy)
+    {
+        _inner = requireNonNull(strategy);
+    }
+
+    @Required
+    public void setUsername(String username)
+    {
+        _username = requireNonNull(username);
+    }
+
+    private boolean isAnonymousUser(Subject subject)
+    {
+        return subject.getPrivateCredentials().stream()
+                    .filter(PasswordCredential.class::isInstance)
+                    .map(PasswordCredential.class::cast)
+                    .anyMatch(p -> _username.equals(p.getUsername())) ||
+                subject.getPrincipals().stream()
+                    .filter(LoginNamePrincipal.class::isInstance)
+                    .anyMatch(p -> _username.equals(p.getName()));
+    }
+
+    @Override
+    public LoginReply login(Subject subject) throws CacheException
+    {
+        if (_anonymousAccess != NONE && isAnonymousUser(subject)) {
+            Set<LoginAttribute> attributes = _anonymousAccess == READONLY ?
+                    singleton(Restrictions.readOnly()) : emptySet();
+            return new LoginReply(Subjects.NOBODY, attributes);
+        }
+
+        return _inner.login(subject);
+    }
+
+    @Override
+    public Principal map(Principal principal) throws CacheException
+    {
+        return _inner.map(principal);
+    }
+
+    @Override
+    public Set<Principal> reverseMap(Principal principal) throws CacheException
+    {
+        return _inner.reverseMap(principal);
+    }
+}
diff --git a/modules/dcache-webdav/src/main/resources/org/dcache/webdav/frontend.xml b/modules/dcache-webdav/src/main/resources/org/dcache/webdav/frontend.xml
index 6c17585b058..d78dcf3137e 100644
--- a/modules/dcache-webdav/src/main/resources/org/dcache/webdav/frontend.xml
+++ b/modules/dcache-webdav/src/main/resources/org/dcache/webdav/frontend.xml
@@ -72,22 +72,20 @@
       </constructor-arg>
   </bean>
 
-  <bean id="union-login-strategy" class="org.dcache.auth.UnionLoginStrategy">
+  <bean id="login-strategy" class="org.dcache.webdav.AnonymousUserLoginStrategy">
       <description>Processes login requests</description>
-      <property name="loginStrategies">
-	  <list>
+      <property name="nonAnonymousStrategy">
           <bean class="org.dcache.services.login.RemoteLoginStrategy">
               <property name="cellStub" ref="login-stub"/>
           </bean>
-	  </list>
       </property>
-      <property name="fallbackToAnonymous" value="false"/>
       <property name="anonymousAccess" value="${frontend.authz.anonymous-operations}"/>
+      <property name="username" value="anonymous"/>
   </bean>
 
   <bean id="cache-login-strategy" class="org.dcache.auth.CachingLoginStrategy">
       <description>Processes mapping requests</description>
-      <constructor-arg index="0" ref="union-login-strategy" />
+      <constructor-arg index="0" ref="login-strategy" />
       <constructor-arg index="1" value="${frontend.service.gplazma.cache.size}" />
       <constructor-arg index="2" value="${frontend.service.gplazma.cache.timeout}" />
       <constructor-arg index="3" value="${frontend.service.gplazma.cache.timeout.unit}" />