diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php
index b6a75c59d473..71e326a07009 100644
--- a/app/Http/Controllers/AccountController.php
+++ b/app/Http/Controllers/AccountController.php
@@ -842,7 +842,7 @@ class AccountController extends BaseController
     {
         $rules = array(
             'name' => 'required',
-            'logo' => 'sometimes|max:512|mimes:jpeg,gif,png',
+            'logo' => 'sometimes|max:200|mimes:jpeg,gif,png',
         );
 
         $validator = Validator::make(Input::all(), $rules);
diff --git a/app/Http/Controllers/PublicClientController.php b/app/Http/Controllers/PublicClientController.php
index 35271aaf66f8..a62b2f2d8594 100644
--- a/app/Http/Controllers/PublicClientController.php
+++ b/app/Http/Controllers/PublicClientController.php
@@ -49,7 +49,7 @@ class PublicClientController extends BaseController
         }
         $invoice = $invitation->invoice;
 
-        $query = $this->activityRepo->findByClientPublicId($invoice->client->public_id);
+        $query = $this->activityRepo->findByClientId($invoice->client_id);
         $query->where('activities.adjustment', '!=', 0);
 
         return Datatable::query($query)
diff --git a/app/Ninja/Repositories/ActivityRepository.php b/app/Ninja/Repositories/ActivityRepository.php
index b2d45b9db01c..811b5fd5c594 100644
--- a/app/Ninja/Repositories/ActivityRepository.php
+++ b/app/Ninja/Repositories/ActivityRepository.php
@@ -61,7 +61,7 @@ class ActivityRepository
         return $activity;
     }
 
-    public function findByClientPublicId($clientPublicId)
+    public function findByClientId($clientId)
     {
         return DB::table('activities')
                     ->join('users', 'users.id', '=', 'activities.user_id')
@@ -70,8 +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('clients.id', '=', $clientId)
                     ->where('contacts.is_primary', '=', 1)
                     ->whereNull('contacts.deleted_at')
                     ->select(
diff --git a/app/Services/ActivityService.php b/app/Services/ActivityService.php
index b8faadf57792..8458d93b5479 100644
--- a/app/Services/ActivityService.php
+++ b/app/Services/ActivityService.php
@@ -18,7 +18,9 @@ class ActivityService extends BaseService
 
     public function getDatatable($clientPublicId = null)
     {
-        $query = $this->activityRepo->findByClientPublicId($clientPublicId);
+        $clientId = Client::getPrivateId($clientPublicId);
+
+        $query = $this->activityRepo->findByClientId($clientId);
 
         return $this->createDatatable(ENTITY_ACTIVITY, $query);
     }
diff --git a/resources/views/invited/dashboard.blade.php b/resources/views/invited/dashboard.blade.php
index aa55a82ec0be..4189a79b1f7b 100644
--- a/resources/views/invited/dashboard.blade.php
+++ b/resources/views/invited/dashboard.blade.php
@@ -155,17 +155,19 @@
             </div>
         </div>
 
-        {!! Datatable::table()
-            ->addColumn(
-                trans('texts.date'),
-                trans('texts.message'),
-                trans('texts.balance'),
-                trans('texts.adjustment'))
-            ->setUrl(route('api.client.activity'))
-            ->setOptions('bFilter', false)
-            ->setOptions('aaSorting', [['0', 'desc']])
-            ->setOptions('sPaginationType', 'bootstrap')
-            ->render('datatable') !!}
+        <div style="min-height: 550px">
+            {!! Datatable::table()
+                ->addColumn(
+                    trans('texts.date'),
+                    trans('texts.message'),
+                    trans('texts.balance'),
+                    trans('texts.adjustment'))
+                ->setUrl(route('api.client.activity'))
+                ->setOptions('bFilter', false)
+                ->setOptions('aaSorting', [['0', 'desc']])
+                ->setOptions('sPaginationType', 'bootstrap')
+                ->render('datatable') !!}
+        </div>
 
     </div>