diff --git a/app/controllers/cmtool/application_controller.rb b/app/controllers/cmtool/application_controller.rb
index 54e85b9..540495b 100644
--- a/app/controllers/cmtool/application_controller.rb
+++ b/app/controllers/cmtool/application_controller.rb
@@ -21,10 +21,8 @@ module Cmtool
       end
     end
 
-    unless method_defined? :cmtool_user
-      def cmtool_user
-        current_user
-      end
+    def cmtool_user
+      defined?(super) ? super : current_user
     end
     helper_method :cmtool_user