diff --git a/config/environments/production.rb b/config/environments/production.rb
index d2b43a46..cb3a5d67 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -77,8 +77,9 @@ Osem::Application.configure do
     user_name:            ENV['OSEM_SMTP_USERNAME'],
     password:             ENV['OSEM_SMTP_PASSWORD'],
     authentication:       ENV['OSEM_SMTP_AUTHENTICATION'].try(:to_sym),
-    domain:		  ENV['OSEM_SMTP_DOMAIN'],
-    enable_starttls_auto: true
+    domain:               ENV['OSEM_SMTP_DOMAIN'],
+    enable_starttls_auto: ENV['OSEM_SMTP_ENABLE_STARTTLS_AUTO'],
+    openssl_verify_mode:  ENV['OSEM_SMTP_OPENSSL_VERIFY_MODE']
   }
 
   # Set the secret_key_base from the env, if not set by any other means