diff --git a/config/application.rb.dist b/config/application.rb.dist
index c025725..d28d914 100644
--- a/config/application.rb.dist
+++ b/config/application.rb.dist
@@ -51,5 +51,8 @@ module FixinMe
 
     # Email address of admin account
     config.admin = 'admin@localhost'
+
+    # Sender address of account registration-related messages
+    Devise.mailer_sender = 'noreply@localhost'
   end
 end
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
index c7f707c..5012fdc 100644
--- a/config/initializers/devise.rb
+++ b/config/initializers/devise.rb
@@ -24,7 +24,8 @@ 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 = 'fixinme@noreply.me'
+  # This is set in 'config/application.rb'.
+  #config.mailer_sender = 'fixinme@noreply.me'
 
   # Configure the class responsible to send e-mails.
   # config.mailer = 'Devise::Mailer'