diff --git a/conf/.env b/conf/.env
index 8f21fa35..1acd9f5b 100644
--- a/conf/.env
+++ b/conf/.env
@@ -85,12 +85,12 @@ WEBFINGER=true
 
 ## Mail Configuration (Post-Installer)
 MAIL_DRIVER=smtp
-MAIL_HOST=localhost
-MAIL_PORT=25
-MAIL_USERNAME=null
-MAIL_PASSWORD=null
+MAIL_HOST=127.0.0.1
+MAIL_PORT=587
+MAIL_USERNAME=__APP__
+MAIL_PASSWORD=__MAIL_PWD__
 MAIL_ENCRYPTION=null
-MAIL_FROM_ADDRESS="pixelfed@__DOMAIN__"
+MAIL_FROM_ADDRESS="__APP__@__DOMAIN__"
 MAIL_FROM_NAME="Pixelfed"
 
 ## S3 Configuration (Post-Installer)