diff --git a/config/initializers/mailer_config.rb b/config/initializers/mailer_config.rb
index 46535ef84..73928f740 100644
--- a/config/initializers/mailer_config.rb
+++ b/config/initializers/mailer_config.rb
@@ -4,14 +4,14 @@
 
 Diaspora::Application.configure do
   config.action_mailer.delivery_method = :smtp
-  config.action_mailer.default_url_options = {:host => 'pivots.joindiaspora.com'}
+  config.action_mailer.default_url_options = {:host => APP_CONFIG[:terse_pod_url]}
   config.action_mailer.smtp_settings = {
-    :address => 'smtp.gmail.com',
-    :port => 587,
-    :domain => 'mail.joindiaspora.com',
-    :authentication => 'plain',
-    :user_name => 'diaspora-pivots@joindiaspora.com',
-    :password => "xy289|]G+R*-kA",
+    :address => APP_CONFIG[:smtp_address],
+    :port => APP_CONFIG[:smtp_port],
+    :domain => APP_CONFIG[:smtp_domain],
+    :authentication => APP_CONFIG[:smtp_authentication],
+    :user_name => APP_CONFIG[:smtp_username],
+    :password => APP_CONFIG[:smtp_password],
     :enable_starttls_auto => true
   }
 end