diff --git a/config/environments/development.rb b/config/environments/development.rb
index 3659143..9b0292c 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -15,6 +15,7 @@ AdoptAHydrant::Application.configure do
 
   # Don't care if the mailer can't send
   config.action_mailer.raise_delivery_errors = false
+  config.action_mailer.default_url_options = {:host => 'localhost:3000'}
 
   # Print deprecation notices to the Rails logger
   config.active_support.deprecation = :log
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 1a7cc0d..a2ef3ff 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -37,7 +37,9 @@ AdoptAHydrant::Application.configure do
   # config.assets.precompile += %w( search.js )
 
   # Disable delivery errors, bad email addresses will be ignored
-  # config.action_mailer.raise_delivery_errors = false
+  config.action_mailer.raise_delivery_errors = true
+  config.action_mailer.delivery_method = :smtp
+  config.action_mailer.default_url_options = {:host => 'adoptahydrant.org'}
 
   # Enable threaded mode
   # config.threadsafe!
diff --git a/config/environments/test.rb b/config/environments/test.rb
index 1066e67..6718b70 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -28,6 +28,7 @@ AdoptAHydrant::Application.configure do
   # The :test delivery method accumulates sent emails in the
   # ActionMailer::Base.deliveries array.
   config.action_mailer.delivery_method = :test
+  config.action_mailer.default_url_options = {:host => 'localhost:3000'}
 
   # Use SQL instead of Active Record's schema dumper when creating the test database.
   # This is necessary if your schema can't be completely dumped by the schema dumper,