diff --git a/crisiscleanup/srv/crisiscleanup/config/environments/production.rb b/crisiscleanup/srv/crisiscleanup/config/environments/production.rb
index f9f60a3..aaf4001 100644
--- a/crisiscleanup/srv/crisiscleanup/config/environments/production.rb
+++ b/crisiscleanup/srv/crisiscleanup/config/environments/production.rb
@@ -16,13 +16,7 @@ Rails.application.configure do
   config.consider_all_requests_local       = false
   config.action_controller.perform_caching = true
   ActionMailer::Base.smtp_settings = {
-  :address        => 'smtp.sendgrid.net',
-  :port           => '587',
-  :authentication => :plain,
-  :user_name      => ENV['SENDGRID_USERNAME'],
-  :password       => ENV['SENDGRID_PASSWORD'],
-  :domain         => 'heroku.com',
-  :enable_starttls_auto => true
+  :address        => '127.0.0.1'
   } 
   config.action_mailer.default_url_options = {
       :host => 'www.crisiscleanup.org',
diff --git a/crisiscleanup/srv/crisiscleanup/config/initializers/devise.rb b/crisiscleanup/srv/crisiscleanup/config/initializers/devise.rb
index d40d96a..96467ba 100644
--- a/crisiscleanup/srv/crisiscleanup/config/initializers/devise.rb
+++ b/crisiscleanup/srv/crisiscleanup/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 = 'no-reply@crisiscleanup.org'
+  config.mailer_sender = 'crisiscleanup@spotter.ngo'
 
   # Configure the class responsible to send e-mails.
   # config.mailer = 'Devise::Mailer'