diff --git a/config/environments/development.rb b/config/environments/development.rb
index 12446d661..6314ef6c6 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -15,7 +15,18 @@ Diaspora::Application.configure do
   config.action_controller.perform_caching = false
 
   # Don't care if the mailer can't send
-  config.action_mailer.raise_delivery_errors = false
+  config.action_mailer.raise_delivery_errors = true
   config.active_support.deprecation = :log
   #config.threadsafe!
+    config.action_mailer.delivery_method = :smtp
+  config.action_mailer.default_url_options = {:host => 'localhost:3000'}
+  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",
+    :enable_starttls_auto => true
+  }
 end
diff --git a/config/environments/production.rb b/config/environments/production.rb
index bfc68495b..6899e8f1c 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -49,7 +49,7 @@ Diaspora::Application.configure do
     :port => 587,
     :domain => 'mail.joindiaspora.com',
     :authentication => 'plain',
-    :user_name => 'diaspora-pivots',
+    :user_name => 'diaspora-pivots@joindiaspora.com',
     :password => "xy289|]G+R*-kA",
     :enable_starttls_auto => true
   }