diff --git a/templates/httpd.conf.mustache b/templates/httpd.conf.mustache
index 6b89c1b..9076520 100644
--- a/templates/httpd.conf.mustache
+++ b/templates/httpd.conf.mustache
@@ -567,10 +567,13 @@ SSLRandomSeed connect builtin
 	DirectoryIndex index.html
 </Directory>
 <VirtualHost *:80>
-	ServerAdmin webmaster@dummy-host.example.com
+{{#vars.apache.admin_email}}
+	ServerAdmin {{.}}
+{{/vars.apache.admin_email}}
 	DocumentRoot "{{vars.apache.default_html_dir}}"
 	ErrorLog "{{vars.apache.log_dir}}/default-error.log"
 	CustomLog "{{vars.apache.log_dir}}/default-access.log" common
+	DirectoryIndex index.php index.html
 </VirtualHost>