diff --git a/config/environments/development.rb b/config/environments/development.rb
index 15d1fc2bb..d848ad4e9 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -24,15 +24,15 @@ Diaspora::Application.configure do
   config.active_support.deprecation = :log
   config.middleware.use MongoMapper::ClearDevMemory
   #config.threadsafe!
-    config.action_mailer.delivery_method = :smtp
-  config.action_mailer.default_url_options = {:host => 'localhost:3000'}
+  config.action_mailer.delivery_method = :smtp
+  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
diff --git a/config/environments/production.rb b/config/environments/production.rb
index cb13c1d1c..6b081b164 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -49,14 +49,14 @@ Diaspora::Application.configure do
   config.threadsafe!
 
   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