diff --git a/lib/cantango/ability/helper/masquerade.rb b/lib/cantango/ability/helper/masquerade.rb
index <HASH>..<HASH> 100644
--- a/lib/cantango/ability/helper/masquerade.rb
+++ b/lib/cantango/ability/helper/masquerade.rb
@@ -2,15 +2,15 @@ module CanTango
   class Ability
     module Helper
       module Masquerade
+        def masquerading?
+          candidate.respond_to?(:masquerading?) && candidate.masquerading?
+        end
+
         def masquerade_user?
           return false if masquerading_off?
           candidate.respond_to?(:active_user) && masquerading?
         end
 
-        def masquerading?
-          candidate.respond_to?(:masquerading?) && candidate.masquerading?
-        end
-
         def masquerade_account?
           return false if masquerading_off?
           candidate.respond_to?(:active_account)
@@ -19,6 +19,12 @@ module CanTango
         def masquerading_off?
           options[:masquerade] == false
         end
+        
+        def subject
+          return candidate.active_user if masquerade_user?
+          return candidate.active_account if masquerade_account?
+          candidate
+        end        
       end
     end
   end
added #subject override to ability helper