diff --git a/schemas/sogis-mysoch-auth.json b/schemas/sogis-mysoch-auth.json
index 0891b0b..de1372d 100644
--- a/schemas/sogis-mysoch-auth.json
+++ b/schemas/sogis-mysoch-auth.json
@@ -56,6 +56,14 @@
         "userid_verify_sql": {
           "description": "Query which verifies whether the userid exist. Must contain the :id placeholder",
           "type": "string"
+        },
+        "tenant_header_name": {
+          "description": "Name of tenant header to set when redirecting on successfull mysoch-auth",
+          "type": "string"
+        },
+        "tenant_header_value": {
+          "description": "Value of tenant header to set when redirecting on successfull mysoch-auth",
+          "type": "string"
         }
       },
       "required": [
diff --git a/src/server.py b/src/server.py
index 80811e4..2a95301 100644
--- a/src/server.py
+++ b/src/server.py
@@ -117,6 +117,11 @@ def login():
         }
         access_token = create_access_token(identity=identity)
         resp = make_response(redirect(target_url))
+        tenant_header_name = config.get("tenant_header_name", "")
+        tenant_header_value = config.get("tenant_header_value", "")
+        if tenant_header_name:
+            app.logger.debug("Setting header %s=%s" % (tenant_header_name, tenant_header_value))
+            resp.headers[tenant_header_name] = tenant_header_value
         set_access_cookies(resp, access_token)
         return resp
     else: