diff --git a/app/Http/Controllers/OneTimeTokenController.php b/app/Http/Controllers/OneTimeTokenController.php
index 34b6ca8fb974..d5079ce055f9 100644
--- a/app/Http/Controllers/OneTimeTokenController.php
+++ b/app/Http/Controllers/OneTimeTokenController.php
@@ -72,8 +72,8 @@ class OneTimeTokenController extends BaseController
 
         $data = [
             'user_id' => auth()->user()->id,
-            'company_key'=> auth()->company()->company_key,
-            'context' => $requst->input('context'),
+            'company_key'=> auth()->user()->company()->company_key,
+            'context' => $request->input('context'),
         ];
 
         Cache::put( $hash, $data, 3600 );
diff --git a/app/Utils/Traits/GeneratesCounter.php b/app/Utils/Traits/GeneratesCounter.php
index 37ecd9887aff..3e7ce126f4ab 100644
--- a/app/Utils/Traits/GeneratesCounter.php
+++ b/app/Utils/Traits/GeneratesCounter.php
@@ -422,6 +422,11 @@ trait GeneratesCounter
      */
     private function resetCounters(Client $client)
     {
+        $reset_counter_frequency = (int)$client->getSetting('reset_counter_frequency_id');
+
+        if($reset_counter_frequency == 0)
+            return;
+        
         $timezone = Timezone::find($client->getSetting('timezone_id'));
 
         $reset_date = Carbon::parse($client->getSetting('reset_counter_date'), $timezone->name);
@@ -430,7 +435,7 @@ trait GeneratesCounter
             return false;
         }
 
-        switch ($client->company->reset_counter_frequency_id) {
+        switch ($reset_counter_frequency) {
             case RecurringInvoice::FREQUENCY_DAILY:
                 $reset_date->addDay();
                 break;
diff --git a/config/ninja.php b/config/ninja.php
index 533fa4900183..1e416435f3ef 100644
--- a/config/ninja.php
+++ b/config/ninja.php
@@ -14,8 +14,8 @@ return [
     'require_https' => env('REQUIRE_HTTPS', true),
     'app_url' => rtrim(env('APP_URL', ''), '/'),
     'app_domain' => env('APP_DOMAIN', ''),
-    'app_version' => '5.1.49',
-    'app_tag' => '5.1.49-release',
+    'app_version' => '5.1.50',
+    'app_tag' => '5.1.50-release',
     'minimum_client_version' => '5.0.16',
     'terms_version' => '1.0.1',
     'api_secret' => env('API_SECRET', false),