diff --git a/reverse-proxy.md b/reverse-proxy.md
index 43cf0277..c4def69e 100644
--- a/reverse-proxy.md
+++ b/reverse-proxy.md
@@ -719,7 +719,8 @@ Add the following `web.config` file to the root of the site you created as the r
   </system.web>
   <system.webServer>
     <rewrite>
-      <rules>
+      <!-- useOriginalURLEncoding needs to be set to false, otherwise IIS will double encode urls causing all files with spaces or special characters to be inaccessible -->
+      <rules useOriginalURLEncoding="false">
         <!-- Force https -->
         <rule name="Https" stopProcessing="true">
           <match url="(.*)" />
@@ -734,7 +735,14 @@ Add the following `web.config` file to the root of the site you created as the r
           <conditions>
             <add input="{HTTPS}" pattern="^ON$" />
           </conditions>
-          <action type="Rewrite" url="http://nc-server-farm:11000/{UNENCODED_URL}" appendQueryString="false" />
+          <!-- Note that {UNENCODED_URL} already contains starting slash, so we must add it directly after the port number without additional slash -->
+          <action type="Rewrite" url="http://nc-server-farm:11000{UNENCODED_URL}" appendQueryString="false" />
+          <!-- Setting forwarded headers is not strictly needed but it is a good practice -->
+	  <serverVariables>
+            <set name="HTTP_X_FORWARDED_HOST" value="{HTTP_HOST}" />
+	    <set name="HTTP_X_FORWARDED_SCHEMA" value="https" />
+	    <set name="HTTP_X_FORWARDED_PROTO" value="https" />
+	  </serverVariables>
         </rule>
       </rules>
     </rewrite>