diff --git a/config/danbooru_default_config.rb b/config/danbooru_default_config.rb
index a434a6865..51b8304ba 100644
--- a/config/danbooru_default_config.rb
+++ b/config/danbooru_default_config.rb
@@ -293,9 +293,8 @@ module Danbooru
       nil
     end
     
-    # If you wish to proxy emails through Amazon SES
     def amazon_ses
-      # {:smtp_server_name => "smtp server name", :user_name => "amazon user name", :ses_smtp_user_name => "smtp user name", :ses_smtp_password => "smtp password"}
+      # {:smtp_server_name => "smtp server", :user_name => "user name", :ses_smtp_user_name => "smtp user name", :ses_smtp_password => "smtp password"}
       nil
     end
   end
diff --git a/config/initializers/z_action_mailer.rb b/config/initializers/z_action_mailer.rb
new file mode 100644
index 000000000..e456a29bc
--- /dev/null
+++ b/config/initializers/z_action_mailer.rb
@@ -0,0 +1,9 @@
+if Danbooru.config.amazon_ses && Rails.env == "production"
+  Danbooru::Application.config.action_mailer.smtp_settings = {
+    :address => Danbooru.config.amazon_ses[:smtp_server_name],
+    :user_name => Danbooru.config.amazon_ses[:smtp_user_name],
+    :password => Danbooru.config.amazon_ses[:smtp_password],
+    :authentication => :login,
+    :enable_starttls_auto => true
+  }
+end