diff --git a/app/mailers/devise_mailer.rb b/app/mailers/devise_mailer.rb
index 30d404a9f..a3f3ed271 100644
--- a/app/mailers/devise_mailer.rb
+++ b/app/mailers/devise_mailer.rb
@@ -1,5 +1,4 @@
 class DeviseMailer < Devise::Mailer
-  helper :application, :settings, :mailer
   include Devise::Controllers::UrlHelpers
   default template_path: "devise/mailer"
 
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
index cf6788ff9..aeb30c2f1 100644
--- a/config/initializers/devise.rb
+++ b/config/initializers/devise.rb
@@ -14,11 +14,15 @@ 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 = proc { "'#{Setting["mailer_from_name"]}' <#{Setting["mailer_from_address"]}>" }
+  # We're not setting it here because it's set by the ApplicationMailer class
+  # config.mailer_sender = "please-change-me-at-config-initializers-devise@example.com"
 
   # Configure the class responsible to send e-mails.
   config.mailer = "DeviseMailer"
 
+  # Configure the parent class responsible to send e-mails.
+  config.parent_mailer = "ApplicationMailer"
+
   # ==> ORM configuration
   # Load and configure the ORM. Supports :active_record (default) and
   # :mongoid (bson_ext recommended) by default. Other ORMs may be
diff --git a/spec/mailers/devise_mailer_spec.rb b/spec/mailers/devise_mailer_spec.rb
index b5c0fb124..3a53daa08 100644
--- a/spec/mailers/devise_mailer_spec.rb
+++ b/spec/mailers/devise_mailer_spec.rb
@@ -18,7 +18,7 @@ describe DeviseMailer do
 
       email = DeviseMailer.confirmation_instructions(create(:user), "ABC")
 
-      expect(email).to deliver_from "'New organization' <new@consul.dev>"
+      expect(email).to deliver_from "New organization <new@consul.dev>"
     end
   end
 end