diff --git a/config/application.rb b/config/application.rb
index 7fc124ade..1f6150e14 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -17,6 +17,7 @@ module Danbooru
     config.plugins = [:all]
     config.time_zone = 'Eastern Time (US & Canada)'
     config.action_mailer.delivery_method = :smtp
+    config.action_mailer.smtp_settings = {:enable_starttls_auto => false}
     config.action_mailer.perform_deliveries = true
     
     # config.action_view.javascript_expansions[:defaults] = [