diff --git a/config/environments/production.rb b/config/environments/production.rb
index a8836c3..9c87e53 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -60,6 +60,10 @@ Rails.application.configure do
   # application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
   # config.assets.precompile += %w( search.js )
 
+  config.action_mailer.delivery_method = :sendmail
+  config.action_mailer.default_options = {from: 'no-reply@openfest.org'}
+  config.action_mailer.default_url_options = {host: 'cfp.openfest.org'}
+
   # Ignore bad email addresses and do not raise email delivery errors.
   # Set this to true and configure the email server for immediate delivery to raise delivery errors.
   # config.action_mailer.raise_delivery_errors = false
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
index 9325e0e..c5204b3 100644
--- a/config/initializers/devise.rb
+++ b/config/initializers/devise.rb
@@ -10,7 +10,7 @@ Devise.setup do |config|
   # 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 = 'cfp@openfest.org'
+  config.mailer_sender = 'no-reply@openfest.org'
 
   # Configure the class responsible to send e-mails.
   # config.mailer = 'Devise::Mailer'