diff --git a/.envrc.sample b/.envrc.sample
index 92cef82..2af2d11 100644
--- a/.envrc.sample
+++ b/.envrc.sample
@@ -36,3 +36,7 @@ export ENTRYPOINT_CONF_VERSION=v1
 #export SAML_SECRET_SALT_VERSION=v1
 
 #export SAML_ENTRYPOINT_CONF_VERSION=v1
+
+## SMTP
+#export COMPOSE_FILE="compose.yml:compose.mailrelay.yml"
+#export SMTP_HOST=postfix_relay_app
diff --git a/LocalSettings.php.tmpl b/LocalSettings.php.tmpl
index 0607ec2..7aa7207 100644
--- a/LocalSettings.php.tmpl
+++ b/LocalSettings.php.tmpl
@@ -182,3 +182,13 @@ $wgGroupPermissions['*']['createaccount'] = false;
 
 $wgDebugLogFile = "/var/log/debug-{$wgDBname}.log";
 {{ end }}
+
+{{ if env "SMTP_HOST" }}
+$wgSMTP = [
+    'host'     => '{{ env "SMTP_HOST" }}', // could also be an IP address. Where the SMTP server is located
+    'port'     => 25,                 // Port to use when connecting to the SMTP server
+    'auth'     => false,               // Should we use SMTP authentication (true or false)
+    #'username' => 'my_user_name',     // Username to use for SMTP authentication (if being used)
+    #'password' => 'my_password'       // Password to use for SMTP authentication (if being used)
+];
+{{ end }}
diff --git a/README.md b/README.md
index 233a51d..ccb9741 100644
--- a/README.md
+++ b/README.md
@@ -21,8 +21,8 @@ Based on [`mediawiki-ve-bundle`][mediawiki-ve].
    abra secret_generate mediawiki_secret_key v1 "pwgen -n 64 1"
    ```
 6. `abra deploy`
-7. `abra run mediawiki /bin/bash` to open a shell
-8. `php /var/www/html/maintenance/createAndPromote.php YourUsername YourPassword`
+7. Create an initial admin user:
+   `abra run app php /var/www/html/maintenance/createAndPromote.php YourUsername YourPassword`
 
 ## SimpleSAMLphp