diff --git a/config/initializers/_load_config.rb b/config/initializers/_load_config.rb
index e52b661..3806c23 100644
--- a/config/initializers/_load_config.rb
+++ b/config/initializers/_load_config.rb
@@ -15,4 +15,6 @@ else
 end
 
 # Set config specific values
-ActionMailer::Base.default_url_options[:host] = Errbit::Config.host
\ No newline at end of file
+(Errbit::Application.config.action_mailer.default_url_options ||= {}).tap do |default|
+  default.merge! :host => Errbit::Config.host if default[:host].blank?
+end
\ No newline at end of file
diff --git a/config/initializers/default_url_options.rb b/config/initializers/default_url_options.rb
deleted file mode 100644
index 0355b0d..0000000
--- a/config/initializers/default_url_options.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-(Errbit::Application.config.action_mailer.default_url_options ||= {}).tap do |default|
-  default.merge! :host => Errbit::Config.host if default[:host].blank?
-end
--
libgit2 0.21.2