diff --git a/swift/common/middleware/keystoneauth.py b/swift/common/middleware/keystoneauth.py
index 3630a1bb77..b26431a92f 100644
--- a/swift/common/middleware/keystoneauth.py
+++ b/swift/common/middleware/keystoneauth.py
@@ -38,9 +38,9 @@ class KeystoneAuth(object):
     installing keystone.
 
     If support is required for unvalidated users (as with anonymous
-    access) or for tempurl/formpost middleware, authtoken will need
-    to be configured with ``delay_auth_decision`` set to 1.  See the
-    Keystone documentation for more detail on how to configure the
+    access) or for formpost/staticweb/tempurl middleware, authtoken will
+    need to be configured with ``delay_auth_decision`` set to true.  See
+    the Keystone documentation for more detail on how to configure the
     authtoken middleware.
 
     In proxy-server.conf you will need to have the setting account
diff --git a/swift/common/middleware/staticweb.py b/swift/common/middleware/staticweb.py
index 8a2061cb17..3f5404a82e 100644
--- a/swift/common/middleware/staticweb.py
+++ b/swift/common/middleware/staticweb.py
@@ -16,8 +16,11 @@
 """
 This StaticWeb WSGI middleware will serve container data as a static web site
 with index file and error file resolution and optional file listings. This mode
-is normally only active for anonymous requests. If you want to use it with
-authenticated requests, set the ``X-Web-Mode: true`` header on the request.
+is normally only active for anonymous requests. When using keystone for
+authentication set ``delay_auth_decision = true`` in the authtoken middleware
+configuration in your ``/etc/swift/proxy-server.conf`` file.  If you want to
+use it with authenticated requests, set the ``X-Web-Mode: true`` header on the
+request.
 
 The ``staticweb`` filter should be added to the pipeline in your
 ``/etc/swift/proxy-server.conf`` file just after any auth middleware. Also, the