diff --git a/config/initializers/mailer.rb b/config/initializers/mailer.rb
index 1be29ee96..2ed599105 100644
--- a/config/initializers/mailer.rb
+++ b/config/initializers/mailer.rb
@@ -19,8 +19,8 @@ Rails.application.configure do
   }
 
   smtp_settings[:authentication] = ENV.fetch('SMTP_AUTHENTICATION', 'login').to_sym if ENV.fetch('SMTP_AUTHENTICATION', '').present?
-  smtp_settings[:user_name] = ENV.fetch('SMTP_USERNAME', '')
-  smtp_settings[:password] = ENV.fetch('SMTP_PASSWORD', '')
+  smtp_settings[:user_name] = ENV['SMTP_USERNAME']
+  smtp_settings[:password] = ENV['SMTP_PASSWORD']
   smtp_settings[:enable_starttls_auto] = ActiveModel::Type::Boolean.new.cast(ENV.fetch('SMTP_ENABLE_STARTTLS_AUTO', true))
   smtp_settings[:openssl_verify_mode] = ENV.fetch('SMTP_OPENSSL_VERIFY_MODE', 'peer')
   smtp_settings[:ssl] = ActiveModel::Type::Boolean.new.cast(ENV.fetch('SMTP_SSL', true)) if ENV['SMTP_SSL']