diff --git a/config/environments/production.rb b/config/environments/production.rb
index 724ae01..5537dde 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -59,7 +59,7 @@ Rails.application.configure do
 
   # Set host to be used by links generated in mailer templates.
   # config.action_mailer.default_url_options = { host: "example.com" }
-  config.action_mailer.default_url_options = ENV.fetch("RAILS_BASE_URL", "example.com")
+  config.action_mailer.default_url_options = { host: ENV.fetch("RAILS_BASE_URL", "example.com") }
 
   config.action_mailer.delivery_method = :smtp
   # Specify outgoing SMTP server. Remember to add smtp/* credentials via rails credentials:edit.
@@ -68,7 +68,10 @@ Rails.application.configure do
     password: ENV.fetch("RAILS_SMTP_PASSWORD", Rails.application.credentials.smtp.password),
     address: ENV.fetch("RAILS_SMTP_HOST", Rails.application.credentials.smtp.address),
     port: ENV.fetch("RAILS_SMTP_PORT", 465),
-    authentication: :plain
+    ssl: ENV.fetch("RAILS_SMTP_SSL", true),
+    open_timeout:    5,
+    read_timeout:    5,
+    authentication: "plain"
   }
 
   # Enable locale fallbacks for I18n (makes lookups for any locale fall back to