diff --git a/config/environments/production.rb b/config/environments/production.rb
index 3acb771c5d7..017bd7b0970 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -37,7 +37,8 @@ Discourse::Application.configure do
       address:              GlobalSetting.smtp_address,
       port:                 GlobalSetting.smtp_port,
       domain:               GlobalSetting.smtp_domain,
-      user_name:            GlobalSetting.smtp_password,
+      user_name:            GlobalSetting.smtp_user_name,
+      password:             GlobalSetting.smtp_password,
       authentication:       'plain',
       enable_starttls_auto: GlobalSetting.smtp_enable_start_tls
     }