diff --git a/app/controllers/checkout_controller.rb b/app/controllers/checkout_controller.rb
index 4022925385..1b8cd07d67 100644
--- a/app/controllers/checkout_controller.rb
+++ b/app/controllers/checkout_controller.rb
@@ -6,9 +6,9 @@ class CheckoutController < ::BaseController
   layout 'darkswarm'
 
   include OrderStockCheck
-  include CheckoutHelper
-  include OrderCyclesHelper
-  include EnterprisesHelper
+
+  helper 'terms_and_conditions'
+  helper 'checkout'
 
   ssl_required
 
diff --git a/app/helpers/injection_helper.rb b/app/helpers/injection_helper.rb
index 7addd06135..3af44f885f 100644
--- a/app/helpers/injection_helper.rb
+++ b/app/helpers/injection_helper.rb
@@ -2,6 +2,8 @@ require 'open_food_network/enterprise_injection_data'
 
 module InjectionHelper
   include SerializerHelper
+  include EnterprisesHelper
+  include OrderCyclesHelper
 
   def inject_enterprises(enterprises = nil)
     inject_json_array(
diff --git a/app/mailers/spree/order_mailer.rb b/app/mailers/spree/order_mailer.rb
index 9fbed9f02b..00002715c3 100644
--- a/app/mailers/spree/order_mailer.rb
+++ b/app/mailers/spree/order_mailer.rb
@@ -2,7 +2,7 @@
 
 module Spree
   class OrderMailer < BaseMailer
-    helper ::CheckoutHelper
+    helper 'checkout'
     helper SpreeCurrencyHelper
     helper Spree::Admin::PaymentsHelper
     helper OrderHelper
diff --git a/app/mailers/subscription_mailer.rb b/app/mailers/subscription_mailer.rb
index 0f60ccbeab..dd20008bfc 100644
--- a/app/mailers/subscription_mailer.rb
+++ b/app/mailers/subscription_mailer.rb
@@ -1,5 +1,5 @@
 class SubscriptionMailer < Spree::BaseMailer
-  helper CheckoutHelper
+  helper 'checkout'
   helper MailerHelper
   helper ShopMailHelper
   helper OrderHelper