diff --git a/volumes/conf.d/validate.vouch.armos.zinomedia.de.conf b/volumes/conf.d/validate.vouch.armos.zinomedia.de.conf
index d40f668..de09ec8 100644
--- a/volumes/conf.d/validate.vouch.armos.zinomedia.de.conf
+++ b/volumes/conf.d/validate.vouch.armos.zinomedia.de.conf
@@ -17,11 +17,14 @@ server {
     add_header Strict-Transport-Security "max-age=31536000; includeSubDomains" always;
 
     location = /validate {
+        # forward the /validate request to Vouch Proxy
+        proxy_pass http://vouch:9090/validate;
+
         # be sure to pass the original host header
         proxy_set_header Host $http_host;
 
         # Vouch Proxy only acts on the request headers
-        proxy_pass_request_body on;
+        proxy_pass_request_body off;
         proxy_set_header Content-Length "";
 
         # optionally add X-Vouch-User as returned by Vouch Proxy along with the request
@@ -31,11 +34,14 @@ server {
         auth_request_set $auth_resp_jwt $upstream_http_x_vouch_jwt;
         auth_request_set $auth_resp_err $upstream_http_x_vouch_err;
         auth_request_set $auth_resp_failcount $upstream_http_x_vouch_failcount;
+    }
 
-        # forward the /validate request to Vouch Proxy
-        resolver 127.0.0.11;
-        set $upstream "http://vouch:9090";
-        proxy_pass $upstream;
+    # if validate returns `401 not authorized` then forward the request to the error401block
+    error_page 401 = @error401;
+
+    location @error401 {
+        # redirect to Vouch Proxy for login
+        return 302 https://vouch.armos.zinomedia.de/login?url=$scheme://$http_host$request_uri&vouch-failcount=$auth_resp_failcount&X-Vouch-Token=$auth_resp_jwt&error=$auth_resp_err;
     }
 }
 
@@ -44,4 +50,5 @@ server {
     listen [::]:80;
     server_name validate.vouch.armos.zinomedia.de;
     return 301 https://$host$request_uri;
-}
\ No newline at end of file
+}
+
diff --git a/volumes/snippets/enable-vouch.conf b/volumes/snippets/enable-vouch.conf
index f5c15d9..54a5c74 100644
--- a/volumes/snippets/enable-vouch.conf
+++ b/volumes/snippets/enable-vouch.conf
@@ -3,6 +3,21 @@ auth_request /validate;
 
 location = /validate {
     proxy_pass https://validate.vouch.armos.zinomedia.de;
+    
+    # be sure to pass the original host header
+    proxy_set_header Host $http_host;
+
+    # Vouch Proxy only acts on the request headers
+    proxy_pass_request_body off;
+    proxy_set_header Content-Length "";
+
+    # optionally add X-Vouch-User as returned by Vouch Proxy along with the request
+    auth_request_set $auth_resp_x_vouch_user $upstream_http_x_vouch_user;
+
+    # these return values are used by the @error401 call
+    auth_request_set $auth_resp_jwt $upstream_http_x_vouch_jwt;
+    auth_request_set $auth_resp_err $upstream_http_x_vouch_err;
+    auth_request_set $auth_resp_failcount $upstream_http_x_vouch_failcount;
 }
 
 # if validate returns `401 not authorized` then forward the request to the error401block