diff --git a/README.MD b/README.MD
index 225dc8e..1b1ffec 100644
--- a/README.MD
+++ b/README.MD
@@ -31,15 +31,16 @@ server {
 	      ssl_certificate		/path/to/certificate.file;
 	      ssl_certificate_key	/path/to/certificate.key
         location / {
-		      proxy_set_header X-Forwarded-Host $host:$server_port;
-    		  proxy_set_header X-Forwarded-Server $host;
-    		  proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-		      proxy_pass 	     http://localhost:8010/;
-		      proxy_redirect 	 http://localhsot:8010/ /;
-		      proxy_read_timeout 60s;
+		      proxy_set_header    X-Forwarded-Host $host:$server_port;
+    		  proxy_set_header    X-Forwarded-Server $host;
+    		  proxy_set_header    X-Forwarded-For $proxy_add_x_forwarded_for;
+		      proxy_pass 	        http://localhost:8010/;
+		      proxy_redirect 	    http://localhsot:8010/ /;
+		      proxy_read_timeout  60s;
         }
     }
-```
+```  
+First run will create sample.ini files in the config directory. Copy these to config.ini and services.ini and configure them to your needs.
 
 ## Future plans
 MailAutoConf is currently in _very_ early stages, with a _very_ limited set of features.
diff --git a/src/sample-config/config.sample.ini b/src/sample-config/config.sample.ini
index e6ddf1d..4d117f0 100644
--- a/src/sample-config/config.sample.ini
+++ b/src/sample-config/config.sample.ini
@@ -1,24 +1,14 @@
 ; Sample config.ini file.
 ; Copy this file to "config/config.ini" and adjust the settings to your requirements
 
-; Set the base domain for use with this service
-Domain = example.com
-LogonDomain = example.local
-RequireAuthDomain = false
-
+; The URL of this application
 BaseURL = "https://autoconfig.example.com"
 
-; Admin User configuration
-; not in use yet
-;[AdminUser]
-;User = "admin"
-;Password = "admin"
+; Set the base email domain for use with this service
+Domain = example.com
 
-; Database configuration
-; not in use yet
-;[Database]
-;Type = "psql"
-;Host = "localhost"
-;Port = 5432
-;User = "davdiscover"
-;Password = "davdiscover"
+; If you use a different domain to authenticate with, enter it here
+LogonDomain = example.local
+
+; Change to true if you need the domain/logondomain to form part of the username
+RequireAuthDomain = false
diff --git a/src/sample-config/services.sample.ini b/src/sample-config/services.sample.ini
index 1632eb7..0862f20 100644
--- a/src/sample-config/services.sample.ini
+++ b/src/sample-config/services.sample.ini
@@ -12,10 +12,14 @@ Port = 465
 SocketType = SSL
 Authentication = password-cleartext
 
-[CalDav]
-Server = "https://caldav.example.com/etc/etc/"
-Port = 443
+; Currently not implemented
+;[Calendar]
+;Server = "https://example.com/remote.php/dav/"
+;Port = 443
+;Type = CalDAV
 
-[CardDav]
-Server = "https://carddav.example.com/etc/etc/"
-Port = 443
+; Currently not implemented
+;[AddressBook]
+;Server = "https://example.com/remote.php/dav/"
+;Port = 443
+;Type = CardDAV