diff --git a/comanage-registry-mod-auth-openidc/Dockerfile.template b/comanage-registry-mod-auth-openidc/Dockerfile.template
index 86b678a..2c753b9 100644
--- a/comanage-registry-mod-auth-openidc/Dockerfile.template
+++ b/comanage-registry-mod-auth-openidc/Dockerfile.template
@@ -117,6 +117,8 @@ RUN mkdir -p "$COMANAGE_REGISTRY_DIR" \
 
 COPY docker-comanage-entrypoint /usr/local/bin/
 
+COPY htaccess /srv/comanage-registry/app/webroot/.htaccess
+
 # expose COmanage Registry local directory
 VOLUME ["/local"]
 
diff --git a/comanage-registry-mod-auth-openidc/htaccess b/comanage-registry-mod-auth-openidc/htaccess
new file mode 100644
index 0000000..abc475b
--- /dev/null
+++ b/comanage-registry-mod-auth-openidc/htaccess
@@ -0,0 +1,11 @@
+<IfModule mod_rewrite.c>
+    RewriteEngine On
+    RewriteCond %{REQUEST_FILENAME} !-d
+    RewriteCond %{REQUEST_FILENAME} !-f
+    RewriteRule ^(.*)$ index.php?/$1 [QSA,L]
+
+    RewriteRule .* - [E=OIDC_CLAIM_NAME_GIVEN:%{HTTP:OIDC_CLAIM_given_name}]
+    RewriteRule .* - [E=OIDC_CLAIM_NAME_FAMILY:%{HTTP:OIDC_CLAIM_family_name}]
+    RewriteRule .* - [E=OIDC_CLAIM_NAME_MIDDLE:%{HTTP:OIDC_CLAIM_middle_name}]
+
+</IfModule>