diff --git a/config/environments/production.rb b/config/environments/production.rb
index 8a2e91f..0a72854 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -57,4 +57,16 @@ Simpledns::Application.configure do
 
   # Send deprecation notices to registered listeners
   config.active_support.deprecation = :notify
+  
+  config.action_mailer.default_url_options = { :host => 'http://simpledns.heroku.com' }
+  config.action_mailer.delivery_method = :smtp
+  config.action_mailer.smtp_settings = {
+    :address              => "smtp.gmail.com",
+    :port                 => 587,
+    :domain               => 'simpledns.heroku.com',
+    :user_name            => 'simpledns.office',
+    :password             => 'jablonskis',
+    :authentication       => 'plain',
+    :enable_starttls_auto => true
+  }
 end
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
index a494a5b..027a7c7 100644
--- a/config/initializers/devise.rb
+++ b/config/initializers/devise.rb
@@ -4,7 +4,7 @@ Devise.setup do |config|
   # ==> Mailer Configuration
   # Configure the e-mail address which will be shown in Devise::Mailer,
   # note that it will be overwritten if you use your own mailer class with default "from" parameter.
-  config.mailer_sender = "please-change-me-at-config-initializers-devise@example.com"
+  config.mailer_sender = "office@simpledns.net"
 
   # Configure the class responsible to send e-mails.
   # config.mailer = "Devise::Mailer"