diff --git a/app/Jobs/Ninja/CompanySizeCheck.php b/app/Jobs/Ninja/CompanySizeCheck.php
index d83e5f1bba2a..89c07bdcdc11 100644
--- a/app/Jobs/Ninja/CompanySizeCheck.php
+++ b/app/Jobs/Ninja/CompanySizeCheck.php
@@ -12,6 +12,7 @@
 namespace App\Jobs\Ninja;
 
 use App\Libraries\MultiDB;
+use App\Models\Account;
 use App\Models\Client;
 use App\Models\Company;
 use Illuminate\Bus\Queueable;
@@ -62,6 +63,22 @@ class CompanySizeCheck implements ShouldQueue
 
                   });
 
+            /* Ensures lower permissioned users return the correct dataset and refresh responses */
+            Account::whereHas('companies', function ($query){
+                    $query->where('is_large',0);
+                  })
+                  ->whereHas('company_users', function ($query){
+
+                    $query->where('is_admin', 0);
+
+                  })            
+                  ->cursor()->each(function ($account){
+
+                    $account->companies()->update(['is_large' => true]);
+
+                  });
+
+
         } else {
             //multiDB environment, need to
             foreach (MultiDB::$dbs as $db) {
@@ -88,6 +105,22 @@ class CompanySizeCheck implements ShouldQueue
 
                       });
 
+                Account::where('plan', 'enterprise')
+                      ->whereDate('plan_expires', '>', now())
+                      ->whereHas('companies', function ($query){
+                        $query->where('is_large',0);
+                      })
+                      ->whereHas('company_users', function ($query){
+
+                        $query->where('is_admin', 0);
+
+                      })            
+                      ->cursor()->each(function ($account){
+
+                        $account->companies()->update(['is_large' => true]);
+
+                      });
+
             }
         }
     }
diff --git a/app/Jobs/Util/WebhookHandler.php b/app/Jobs/Util/WebhookHandler.php
index 57c6c9b22aba..1d728faefb98 100644
--- a/app/Jobs/Util/WebhookHandler.php
+++ b/app/Jobs/Util/WebhookHandler.php
@@ -79,18 +79,16 @@ class WebhookHandler implements ShouldQueue
                                     ->cursor()
                                     ->each(function ($subscription) {
 
-            // $this->process($subscription);
-
             WebhookSingle::dispatch($subscription->id, $this->entity, $this->company->db, $this->includes);
 
         });
 
     }
 
-    public function failed($exception)
+    public function failed($exception = null)
     {
-        
-        nlog(print_r($exception->getMessage(), 1));
+        if($exception)
+            nlog(print_r($exception->getMessage(), 1));
 
     }
 }