You will want to tweak this
@current_user ||= User.find_by(id: session[:user_id]) if session[:user_id]
and this code
tracked owner: Proc.new { |controller, model| controller.current_user ? controller.current_user : nil }[...]
accordingly. Just more checkings come into play - you also check if the person is logged in as admin.