diff --git a/app/policies/application_policy.rb b/app/policies/application_policy.rb
index ae8931c..7f7c50b 100644
--- a/app/policies/application_policy.rb
+++ b/app/policies/application_policy.rb
@@ -3,6 +3,8 @@
 class ApplicationPolicy
   attr_reader :context, :record
 
+  delegate :account, :params, to: :context, allow_nil: true
+
   def initialize(context, record)
     @context = context
     @record = record
@@ -46,14 +48,6 @@ class ApplicationPolicy
 
 private
 
-  def account
-    context&.account
-  end
-
-  def params
-    context&.params
-  end
-
   def restricted?
     Rails.application.restricted?
   end
@@ -61,6 +55,8 @@ private
   class Scope
     attr_reader :context, :scope
 
+    delegate :account, :params, to: :context, allow_nil: true
+
     def initialize(context, scope)
       @context = context
       @scope = scope
@@ -76,14 +72,6 @@ private
 
   private
 
-    def account
-      context&.account
-    end
-
-    def params
-      context&.params
-    end
-
     def restricted?
       Rails.application.restricted?
     end