diff --git a/access.lua b/access.lua
index c2fb785..dae2aba 100644
--- a/access.lua
+++ b/access.lua
@@ -137,13 +137,16 @@ function set_headers (user)
         end
     end
 
-    ngx.req.set_header("Auth-User", user)
-    ngx.req.set_header("Remote-User", user)
-    ngx.req.set_header("Name", cache[user]["cn"])
-    ngx.req.set_header("Email", cache[user]["mail"])
+    -- Set HTTP Auth header
     ngx.req.set_header("Authorization", "Basic "..ngx.encode_base64(
       cache[user]["uid"]..":"..cache[user]["password"]
     ))
+
+    -- Set Additional headers
+    for k, v in pairs(conf["additional_headers"]) do
+        ngx.req.set_header(k, cache[user][v])
+    end
+
 end
 
 function display_login_form ()
diff --git a/conf.json b/conf.json
index bc252b9..05ea178 100644
--- a/conf.json
+++ b/conf.json
@@ -11,5 +11,11 @@
        "mydomain.com/megusta",
        "myotherdomain.com/somuchwin"
     ],
-   "unprotected_urls": ["mydomain.com/yunoprotect"]
+   "unprotected_urls": ["mydomain.com/yunoprotect"],
+   "additional_headers": {
+       "Auth-User": "uid",
+       "Remote-User": "uid",
+       "Email": "mail",
+       "Name": "cn"
+   }
 }