diff --git a/app/Http/Controllers/ReportController.php b/app/Http/Controllers/ReportController.php
index a09ab46e9595..cc4f3c4946de 100644
--- a/app/Http/Controllers/ReportController.php
+++ b/app/Http/Controllers/ReportController.php
@@ -103,6 +103,17 @@ class ReportController extends BaseController
             if ($enableChart) {
                 $params = array_merge($params, self::generateChart($groupBy, $startDate, $endDate));
             }
+        } else {
+            $params['columns'] = [];
+            $params['displayData'] = [];
+            $params['reportTotals'] = [
+                'amount' => [],
+                'balance' => [],
+                'paid' => [],
+            ];
+            $params['labels'] = [];
+            $params['datasets'] = [];
+            $params['scaleStepWidth'] = 100;
         }
 
         return View::make('reports.chart_builder', $params);
diff --git a/app/Libraries/Utils.php b/app/Libraries/Utils.php
index 4fc57c4d3233..121bc5914b35 100644
--- a/app/Libraries/Utils.php
+++ b/app/Libraries/Utils.php
@@ -847,7 +847,7 @@ class Utils
 
         $today = new DateTime('now');
         $datePaid = DateTime::createFromFormat('Y-m-d', $date);
-        $interval = $today->diff($date);
+        $interval = $today->diff($datePaid);
 
         return $interval->y == 0;
     }
diff --git a/app/Ninja/Repositories/ActivityRepository.php b/app/Ninja/Repositories/ActivityRepository.php
index 0893bbffdea4..b2d45b9db01c 100644
--- a/app/Ninja/Repositories/ActivityRepository.php
+++ b/app/Ninja/Repositories/ActivityRepository.php
@@ -70,6 +70,7 @@ class ActivityRepository
                     ->leftJoin('invoices', 'invoices.id', '=', 'activities.invoice_id')
                     ->leftJoin('payments', 'payments.id', '=', 'activities.payment_id')
                     ->leftJoin('credits', 'credits.id', '=', 'activities.credit_id')
+                    ->where('clients.account_id', '=', Auth::user()->account_id)
                     ->where('clients.public_id', '=', $clientPublicId)
                     ->where('contacts.is_primary', '=', 1)
                     ->whereNull('contacts.deleted_at')