diff --git a/config/application.rb b/config/application.rb
index 4169a4b..14455e4 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -31,6 +31,8 @@ module Wrestling
     
     config.action_mailer.delivery_method   = :postmark
     config.action_mailer.postmark_settings = { :api_token => ENV['POSTMARK_API_TOKEN'] }
+    #Devise needs origin of email
+    config.action_mailer.default_url_options = { :host => 'wrestlingapp.heroku.com' }
   end
 
   
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 30f7ebc..03dd831 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -73,13 +73,6 @@ Wrestling::Application.configure do
   # Ignore bad email addresses and do not raise email delivery errors.
   # Set this to true and configure the email server for immediate delivery to raise delivery errors.
   # config.action_mailer.raise_delivery_errors = false
-  
-  #Devise needs origin of email
-  config.action_mailer.default_url_options = { :host => 'wrestlingapp.heroku.com' }
-  
-  #Postmark
-  config.action_mailer.delivery_method = :postmark
-  config.action_mailer.postmark_settings = { :api_key => ENV["POSTMARK_API_TOKEN"] }
 
   # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
   # the I18n.default_locale when a translation can not be found).