diff --git a/app/models/spree/payment_method_decorator.rb b/app/models/spree/payment_method_decorator.rb
index 1cff5f4611..f8759ac06b 100644
--- a/app/models/spree/payment_method_decorator.rb
+++ b/app/models/spree/payment_method_decorator.rb
@@ -13,4 +13,9 @@ Spree::PaymentMethod.class_eval do
       where('distributor_id IN (?)', user.enterprises.map {|enterprise| enterprise.id })
     end
   }
+end
+
+# Ensure that all derived classes also allow distributor_id
+Spree::Gateway.providers.each do |p|
+  p.attr_accessible :distributor_id
 end
\ No newline at end of file