diff --git a/.env.example b/.env.example
index c2abddf..5bbe8f7 100644
--- a/.env.example
+++ b/.env.example
@@ -4,6 +4,8 @@ HOST=example.com
 ALLOWED_IPS=add_internal_proxy_ip_here
 
 SMTP_HOST=mail.example.com
-SMTP_EMAIL=cloud@example.com
 SMTP_PASS=1234
+
+# cloud@example.com
+SMTP_USER=cloud
 SMTP_DOMAIN=example.com
diff --git a/docker-compose.yml b/docker-compose.yml
index e97f623..303ce33 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -34,9 +34,9 @@ services:
             - "REDIS_HOST=redis"
             - "SMTP_HOST=${SMTP_HOST}"
             - "SMTP_SECURE=ssl"
-            - "SMTP_NAME=${SMTP_EMAIL}"
+            - "SMTP_NAME=${SMTP_USER}@${SMTP_DOMAIN}"
             - "SMTP_PASSWORD=${SMTP_PASS}"
-            - "MAIL_FROM_ADDRESS=cloud"
+            - "MAIL_FROM_ADDRESS=${SMTP_USER}"
             - "MAIL_DOMAIN=${SMTP_DOMAIN}"
             - "NEXTCLOUD_TRUSTED_DOMAINS=${HOST} ${ALLOWED_IPS}"
         networks: