diff --git a/admin/servers.conf.erb b/admin/servers.conf.erb
index 2446d851dfe..98c419bb977 100644
--- a/admin/servers.conf.erb
+++ b/admin/servers.conf.erb
@@ -122,8 +122,11 @@ server {
     proxy_set_header X-Source-Front <%= ENV['APP'] %>;
 
     # Set X-Forwarded-xxx headers for the API to compute getForwardedOrigin
-    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+    proxy_set_header X-Forwarded-Host $http_host;
     proxy_set_header X-Forwarded-Proto $scheme;
+
+    # Set X-Forwarded-For header to be able to know the remote client IP
+    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
   }
 
   <% end %>
diff --git a/certif/servers.conf.erb b/certif/servers.conf.erb
index 11f0e82a6b5..05909172c89 100644
--- a/certif/servers.conf.erb
+++ b/certif/servers.conf.erb
@@ -139,8 +139,11 @@ server {
     proxy_set_header X-Source-Front <%= ENV['APP'] %>;
 
     # Set X-Forwarded-xxx headers for the API to compute getForwardedOrigin
-    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+    proxy_set_header X-Forwarded-Host $http_host;
     proxy_set_header X-Forwarded-Proto $scheme;
+
+    # Set X-Forwarded-For header to be able to know the remote client IP
+    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
   }
 
   <% end %>
diff --git a/junior/servers.conf.erb b/junior/servers.conf.erb
index 5d157d95560..453399b64ed 100644
--- a/junior/servers.conf.erb
+++ b/junior/servers.conf.erb
@@ -117,8 +117,11 @@ server {
     proxy_set_header X-Source-Front <%= ENV['APP'] %>;
 
     # Set X-Forwarded-xxx headers for the API to compute getForwardedOrigin
-    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+    proxy_set_header X-Forwarded-Host $http_host;
     proxy_set_header X-Forwarded-Proto $scheme;
+
+    # Set X-Forwarded-For header to be able to know the remote client IP
+    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
   }
 
   <% end %>
diff --git a/mon-pix/servers.conf.erb b/mon-pix/servers.conf.erb
index 49eca96f6f4..a4c209af17b 100644
--- a/mon-pix/servers.conf.erb
+++ b/mon-pix/servers.conf.erb
@@ -146,8 +146,11 @@ server {
     proxy_set_header X-Source-Front <%= ENV['APP'] %>;
 
     # Set X-Forwarded-xxx headers for the API to compute getForwardedOrigin
-    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+    proxy_set_header X-Forwarded-Host $http_host;
     proxy_set_header X-Forwarded-Proto $scheme;
+
+    # Set X-Forwarded-For header to be able to know the remote client IP
+    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
   }
 
   <% end %>
diff --git a/orga/servers.conf.erb b/orga/servers.conf.erb
index 11f0e82a6b5..05909172c89 100644
--- a/orga/servers.conf.erb
+++ b/orga/servers.conf.erb
@@ -139,8 +139,11 @@ server {
     proxy_set_header X-Source-Front <%= ENV['APP'] %>;
 
     # Set X-Forwarded-xxx headers for the API to compute getForwardedOrigin
-    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+    proxy_set_header X-Forwarded-Host $http_host;
     proxy_set_header X-Forwarded-Proto $scheme;
+
+    # Set X-Forwarded-For header to be able to know the remote client IP
+    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
   }
 
   <% end %>