diff --git a/deploy-chatmail/src/deploy_chatmail/nginx/index.html.j2 b/deploy-chatmail/src/deploy_chatmail/nginx/index.html.j2
index d9687431..49e66064 100644
--- a/deploy-chatmail/src/deploy_chatmail/nginx/index.html.j2
+++ b/deploy-chatmail/src/deploy_chatmail/nginx/index.html.j2
@@ -13,7 +13,7 @@
         <li>Scan or Tap on the invite QR code</li>
         <li>Choose Nickname and Avatar</li>
         <li>Use QR code invites and scans to setup end-to-end encrypted communication
-        with any e-mail address</li>
+        with any Delta Chat user</li>
     </ol>
     <a href="DCACCOUNT:https://{{ config.mail_domain }}/cgi-bin/newemail.py">
         <img class="section" src="qrcode.png" />
diff --git a/deploy-chatmail/src/deploy_chatmail/nginx/nginx.conf.j2 b/deploy-chatmail/src/deploy_chatmail/nginx/nginx.conf.j2
index e2a71097..73a02e62 100644
--- a/deploy-chatmail/src/deploy_chatmail/nginx/nginx.conf.j2
+++ b/deploy-chatmail/src/deploy_chatmail/nginx/nginx.conf.j2
@@ -41,20 +41,8 @@ http {
 			try_files $uri $uri/ =404;
 		}
 
-		location /cgi-bin/ { 
-			# Set the root to /usr/lib (inside this location this means that we are
-			# giving access to the files under /usr/lib/cgi-bin)
-			root  /usr/lib;
-
-			# Fastcgi socket
-			fastcgi_pass  unix:/var/run/fcgiwrap.socket;
-
-			# Fastcgi parameters, include the standard ones
-			include /etc/nginx/fastcgi_params;
-
-			# Adjust non standard parameters (SCRIPT_FILENAME)
-			# fastcgi_param SCRIPT_FILENAME  /usr/lib$fastcgi_script_name;
-        }
+        # add cgi-bin support
+        include /usr/share/doc/fcgiwrap/examples/nginx.conf;
 	}
     server {
         listen 80 default_server;