diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
index fc30ea971..774ec13f8 100644
--- a/config/initializers/devise.rb
+++ b/config/initializers/devise.rb
@@ -25,7 +25,7 @@
   # 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 = "contact@planningalerts.org.au"
+  config.mailer_sender = "PlanningAlerts <no-reply@planningalerts.org.au>"
 
   # Configure the class responsible to send e-mails.
   # config.mailer = 'Devise::Mailer'
diff --git a/spec/features/user_sign_up_spec.rb b/spec/features/user_sign_up_spec.rb
index 9cc899057..521719379 100644
--- a/spec/features/user_sign_up_spec.rb
+++ b/spec/features/user_sign_up_spec.rb
@@ -21,6 +21,9 @@
     open_email("henare@oaf.org.au")
     expect(current_email).to have_subject("PlanningAlerts: Confirmation instructions")
     expect(current_email.default_part_body.to_s).to include("Please confirm your account email by clicking the link below")
+    expect(current_email.from).to eq(["no-reply@planningalerts.org.au"])
+    # TODO: This should be changed to "Planning Alerts"
+    expect(current_email[:from].display_names).to eq(["PlanningAlerts"])
   end
 
   describe "Check your email page in the new design" do