diff --git a/config/environments/development.rb b/config/environments/development.rb
index 7d792ca01..5f6bbe557 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -48,7 +48,7 @@ Rails.application.configure do
     address: Rails.application.secrets.mailer_address,
     port: Rails.application.secrets.mailer_port,
     domain: Rails.application.secrets.mailer_domain,
-    authentication: 'plain',
+    authentication: Rails.application.secrets.mailer_authentication,
     enable_starttls_auto: true,
     user_name: Rails.application.secrets.mailer_user_name,
     password: Rails.application.secrets.mailer_password
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 4139b3957..79504c7dc 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -33,7 +33,7 @@ Rails.application.configure do
     address: Rails.application.secrets.mailer_address,
     port: Rails.application.secrets.mailer_port,
     domain: Rails.application.secrets.mailer_domain,
-    authentication: "plain",
+    authentication: Rails.application.secrets.mailer_authentication,
     enable_starttls_auto: true,
     user_name: Rails.application.secrets.mailer_user_name,
     password: Rails.application.secrets.mailer_password
diff --git a/config/environments/test.rb b/config/environments/test.rb
index c35f9ba75..16ec7dc75 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -62,7 +62,7 @@ Rails.application.configure do
     address: Rails.application.secrets.mailer_address,
     port: Rails.application.secrets.mailer_port,
     domain: Rails.application.secrets.mailer_domain,
-    authentication: "plain",
+    authentication: Rails.application.secrets.mailer_authentication,
     enable_starttls_auto: true,
     user_name: Rails.application.secrets.mailer_user_name,
     password: Rails.application.secrets.mailer_password
diff --git a/config/secrets.yml b/config/secrets.yml
index 974d6b9e9..2e839220f 100644
--- a/config/secrets.yml
+++ b/config/secrets.yml
@@ -37,6 +37,7 @@ common: &common
   mailer_reply_to: <%= ENV["MAIL_REPLYTO"] %>
   mailer_address: <%= ENV["SMTP_ADDRESS"] %>
   mailer_port: <%= ENV["SMTP_PORT"] || "587" %>
+  mailer_authentication: <%= ENV["SMTP_AUTH_METHOD"] || "plain" %>
   mailer_domain: <%= ENV["SMTP_DOMAIN"] %>
   mailer_user_name: <%= ENV["SMTP_USERNAME"] %>
   mailer_password: <%= ENV["SMTP_PASSWORD"] %>