diff --git a/ansible/pre-deploy.yml b/ansible/pre-deploy.yml
index 57d4dad..e2d77ab 100644
--- a/ansible/pre-deploy.yml
+++ b/ansible/pre-deploy.yml
@@ -106,6 +106,7 @@
           SMTP_HOST: "{{ smtp_host }}"
           SMTP_TLS_ENABLED: "{{ smtp_tls_enabled }}"
           SMTP_USER: "{{ smtp_user }}"
+          SMTP_PASSWD: "{{ smtp_passwd }}"
           SSH_DOMAIN: "{{ ssh_domain }}"
           SSH_LISTEN_PORT: "{{ ssh_listen_port }}"
           SSH_PORT: "{{ ssh_port }}"
diff --git a/sbin/entrypoint.sh b/sbin/entrypoint.sh
index d9f9da6..1ef3867 100755
--- a/sbin/entrypoint.sh
+++ b/sbin/entrypoint.sh
@@ -84,8 +84,8 @@ setup_app_ini() {
     crudini --set "$app_ini" mailer ENABLED "${MAILER_ENABLED}"
     crudini --set "$app_ini" mailer FROM "${SMTP_FROM}"
     crudini --set "$app_ini" mailer HOST "${SMTP_HOST}"
-    crudini --set "$app_ini" mailer USER "${USER}"
-    crudini --set "$app_ini" mailer PASSWD "${PASSWD}"
+    crudini --set "$app_ini" mailer USER "${SMTP_USER}"
+    crudini --set "$app_ini" mailer PASSWD "${SMTP_PASSWD}"
 }
 
 main() {