diff --git a/app/controllers/spree/admin/orders/customer_details_controller_decorator.rb b/app/controllers/spree/admin/orders/customer_details_controller_decorator.rb
index fe98451154..bbccdf9174 100644
--- a/app/controllers/spree/admin/orders/customer_details_controller_decorator.rb
+++ b/app/controllers/spree/admin/orders/customer_details_controller_decorator.rb
@@ -1,8 +1,8 @@
 Spree::Admin::Orders::CustomerDetailsController.class_eval do
-  #Override BaseController.authorize_admin to inherit CanCan permissions for the current order
-  def authorize_admin
-      load_order unless @order
-      authorize! :admin, @order
-      authorize! params[:action].to_sym, @order
+  # Inherit CanCan permissions for the current order
+  def model_class
+    load_order unless @order
+    @order
   end
+
 end
\ No newline at end of file
diff --git a/app/controllers/spree/admin/reports_controller_decorator.rb b/app/controllers/spree/admin/reports_controller_decorator.rb
index b4cf6c394c..244c62163f 100644
--- a/app/controllers/spree/admin/reports_controller_decorator.rb
+++ b/app/controllers/spree/admin/reports_controller_decorator.rb
@@ -11,6 +11,11 @@ Spree::Admin::ReportsController.class_eval do
   Spree::Admin::ReportsController::AVAILABLE_REPORTS.merge!({:payments => {:name => "Payment Reports", :description => "Reports for Payments"}})
   Spree::Admin::ReportsController::AVAILABLE_REPORTS.merge!({:order_cycles => {:name => "Order Cycle Reports", :description => "Reports for Order Cycles"}})
 
+  # Equivalent to CanCan's "authorize_resource :class => false" (see https://github.com/ryanb/cancan/blob/60cf6a67ef59c0c9b63bc27ea0101125c4193ea6/lib/cancan/controller_resource.rb#L146)
+  def model_class
+    self.class.to_s.sub("Controller", "").underscore.split('/').last.singularize.to_sym
+  end
+
   def orders_and_distributors
     params[:q] = {} unless params[:q]