diff --git a/.env.sample b/.env.sample
index 86f24bf..2847876 100644
--- a/.env.sample
+++ b/.env.sample
@@ -28,10 +28,11 @@ SECRET_DB_PASSWORD_VERSION=v1
 #NGINX_WEBSEED_CDN_ENABLE=true
 #NGINX_WEBSEED_CDN_URI=https://some-bucket.some-cdn.net
 
-## E-mail settings
+## E-mail settings                            # <= EDIT ALL THIS
 #COMPOSE_FILE="compose.yml:compose.smtp.yml"
 #PEERTUBE_SMTP_ENABLED=1
 #SECRET_SMTP_PASSWORD_VERSION=v1
+#PEERTUBE_SMTP_USERNAME=foobar
 #PEERTUBE_SMTP_HOSTNAME=postfix_relay_app
 #PEERTUBE_SMTP_PORT=25
 #PEERTUBE_SMTP_FROM=peertube@example.com # <= EDIT THIS
diff --git a/compose.smtp.yml b/compose.smtp.yml
index 08c54d7..ec34511 100644
--- a/compose.smtp.yml
+++ b/compose.smtp.yml
@@ -8,8 +8,10 @@ services:
       - PEERTUBE_SMTP_ENABLED
       - PEERTUBE_SMTP_FROM
       - PEERTUBE_SMTP_HOSTNAME
+      - PEERTUBE_SMTP_PASSWORD_FILE: /run/secrets/smtp_password
       - PEERTUBE_SMTP_PORT
       - PEERTUBE_SMTP_TLS
+      - PEERTUBE_SMTP_USERNAME
     secrets:
       - smtp_password
 
diff --git a/entrypoint.sh b/entrypoint.sh
index d9b80f7..59d5ce6 100644
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -22,5 +22,6 @@ file_env() {
 }
 
 file_env "PEERTUBE_DB_PASSWORD"
+file_env "PEERTUBE_SMTP_PASSWORD"
 
 exec /entrypoint.sh "$@"