diff --git a/conf/.env.example b/conf/.env.example
index f98ee6e..56e6509 100644
--- a/conf/.env.example
+++ b/conf/.env.example
@@ -52,8 +52,8 @@ MAIL_FROM=bookstack@__DOMAIN__
 # feature found in the "Settings > Maintenance" area of the system.
 MAIL_HOST=localhost
 MAIL_PORT=25
-MAIL_USERNAME=bookstack
-MAIL_PASSWORD=null
+MAIL_USERNAME=__APP__
+MAIL_PASSWORD=__MAIL_PWD__
 MAIL_ENCRYPTION=null
 
 # General auth
diff --git a/manifest.toml b/manifest.toml
index 69dd0f7..5ef8cfb 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -62,6 +62,7 @@ ram.runtime = "50M"
         autoupdate.strategy = "latest_github_tag"
 
     [resources.system_user]
+    allow_email = true
 
     [resources.install_dir]