diff --git a/app/Console/Commands/CreateTestData.php b/app/Console/Commands/CreateTestData.php
index 8d4ab8041e4a..ac7bcf8daa56 100644
--- a/app/Console/Commands/CreateTestData.php
+++ b/app/Console/Commands/CreateTestData.php
@@ -112,6 +112,8 @@ class CreateTestData extends Command
         $company_token->account_id = $account->id;
         $company_token->name = 'test token';
         $company_token->token = Str::random(64);
+        $company_token->is_system = true;
+
         $company_token->save();
 
         $user->companies()->attach($company->id, [
@@ -207,6 +209,7 @@ class CreateTestData extends Command
         $company_token->account_id = $account->id;
         $company_token->name = 'test token';
         $company_token->token = Str::random(64);
+        $company_token->is_system = true;
         $company_token->save();
 
         $user->companies()->attach($company->id, [
@@ -304,6 +307,7 @@ class CreateTestData extends Command
         $company_token->account_id = $account->id;
         $company_token->name = 'test token';
         $company_token->token = Str::random(64);
+        $company_token->is_system = true;
         $company_token->save();
 
         $user->companies()->attach($company->id, [
diff --git a/app/Console/Commands/DemoMode.php b/app/Console/Commands/DemoMode.php
index 7395ddb9d6a8..f7bec794eea8 100644
--- a/app/Console/Commands/DemoMode.php
+++ b/app/Console/Commands/DemoMode.php
@@ -137,6 +137,8 @@ class DemoMode extends Command
         $company_token->account_id = $account->id;
         $company_token->name = 'test token';
         $company_token->token = Str::random(64);
+        $company_token->is_system = true;
+        
         $company_token->save();
 
         $user->companies()->attach($company->id, [
diff --git a/app/Http/Controllers/MigrationController.php b/app/Http/Controllers/MigrationController.php
index 59c7db415a5a..b2369aa84a8f 100644
--- a/app/Http/Controllers/MigrationController.php
+++ b/app/Http/Controllers/MigrationController.php
@@ -228,6 +228,7 @@ class MigrationController extends BaseController
             $company_token->account_id = $account->id;
             $company_token->name = $request->token_name ?? Str::random(12);
             $company_token->token = $request->token ?? \Illuminate\Support\Str::random(64);
+            $company_token->is_system = true;
             $company_token->save();
 
             $user->companies()->attach($company->id, [
@@ -287,6 +288,8 @@ class MigrationController extends BaseController
             $company_token->account_id = $account->id;
             $company_token->name = $request->token_name ?? Str::random(12);
             $company_token->token = $request->token ?? \Illuminate\Support\Str::random(64);
+                    $company_token->is_system = true;
+
             $company_token->save();
 
             $user->companies()->attach($company->id, [
@@ -320,6 +323,8 @@ class MigrationController extends BaseController
             $company_token->account_id = $account->id;
             $company_token->name = $request->token_name ?? Str::random(12);
             $company_token->token = $request->token ?? \Illuminate\Support\Str::random(64);
+                    $company_token->is_system = true;
+
             $company_token->save();
 
             $user->companies()->attach($company->id, [
@@ -346,6 +351,8 @@ class MigrationController extends BaseController
             $company_token->account_id = $account->id;
             $company_token->name = $request->token_name ?? Str::random(12);
             $company_token->token = $request->token ?? \Illuminate\Support\Str::random(64);
+                    $company_token->is_system = true;
+
             $company_token->save();
 
             $user->companies()->attach($company->id, [
diff --git a/app/Jobs/Company/CreateCompanyToken.php b/app/Jobs/Company/CreateCompanyToken.php
index 26bdf1601140..da8a07d3e2c2 100644
--- a/app/Jobs/Company/CreateCompanyToken.php
+++ b/app/Jobs/Company/CreateCompanyToken.php
@@ -59,6 +59,8 @@ class CreateCompanyToken implements ShouldQueue
         $company_token->account_id = $this->user->account->id;
         $company_token->name = $this->custom_token_name ?: $this->user->first_name. ' '. $this->user->last_name;
         $company_token->token = Str::random(64);
+        $company_token->is_system = true;
+
         $company_token->save();
 
         
diff --git a/app/Repositories/TokenRepository.php b/app/Repositories/TokenRepository.php
index d63cb6f54ae0..18aca4b3b7ac 100644
--- a/app/Repositories/TokenRepository.php
+++ b/app/Repositories/TokenRepository.php
@@ -37,7 +37,7 @@ class TokenRepository extends BaseRepository
     public function save(array $data, CompanyToken $company_token)
     {
         $company_token->fill($data);
-        $company_token->is_system = true;
+        $company_token->is_system = false;
         
         $company_token->save();
 
diff --git a/tests/MockAccountData.php b/tests/MockAccountData.php
index 5c5105b607f8..18c02ecc300d 100644
--- a/tests/MockAccountData.php
+++ b/tests/MockAccountData.php
@@ -142,6 +142,8 @@ trait MockAccountData
         $company_token->account_id = $this->account->id;
         $company_token->name = 'test token';
         $company_token->token = $this->token;
+        $company_token->is_system = true;
+
         $company_token->save();