diff --git a/VERSION.txt b/VERSION.txt
index 59cff2f9dcf7..be9b7a8c2e89 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -1 +1 @@
-5.5.98
\ No newline at end of file
+5.5.99
\ No newline at end of file
diff --git a/app/DataMapper/CompanySettings.php b/app/DataMapper/CompanySettings.php
index 37eea6e463e0..efb4dd443402 100644
--- a/app/DataMapper/CompanySettings.php
+++ b/app/DataMapper/CompanySettings.php
@@ -473,13 +473,10 @@ class CompanySettings extends BaseSettings
 
     public $client_initiated_payments_minimum = 0;
 
-    // public $client_initiated_payments_recurring = false;
-
     public $sync_invoice_quote_columns = true;
 
     public static $casts = [
         'mailgun_endpoint'                   => 'string',    
-        // 'client_initiated_payments_recurring'=> 'bool',
         'client_initiated_payments'          => 'bool',
         'client_initiated_payments_minimum'  => 'float',
         'sync_invoice_quote_columns'         => 'bool',
diff --git a/app/Http/Controllers/ClientPortal/PrePaymentController.php b/app/Http/Controllers/ClientPortal/PrePaymentController.php
index 107cbac6d95e..2d80027f0650 100644
--- a/app/Http/Controllers/ClientPortal/PrePaymentController.php
+++ b/app/Http/Controllers/ClientPortal/PrePaymentController.php
@@ -44,7 +44,6 @@ class PrePaymentController extends Controller
 
         $data = [
             'title' => ctrans('texts.amount'). " " .$client->currency()->code." (".auth()->guard('contact')->user()->client->currency()->symbol . ")",
-            // 'allows_recurring' => auth()->guard('contact')->user()->client->getSetting('client_initiated_payments_recurring'),
             'allows_recurring' => true,
             'minimum' => $minimum,
             'minimum_amount' =>  $minimum_amount,
diff --git a/config/ninja.php b/config/ninja.php
index ca9e12160b21..260282b1d61a 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', 'invoicing.co'),
-    'app_version' => '5.5.98',
-    'app_tag' => '5.5.98',
+    'app_version' => '5.5.99',
+    'app_tag' => '5.5.99',
     'minimum_client_version' => '5.0.16',
     'terms_version' => '1.0.1',
     'api_secret' => env('API_SECRET', ''),
diff --git a/database/migrations/2023_03_21_053933_tax_calculations_for_invoices.php b/database/migrations/2023_03_21_053933_tax_calculations_for_invoices.php
index b488dcbbf1fb..76022056235a 100644
--- a/database/migrations/2023_03_21_053933_tax_calculations_for_invoices.php
+++ b/database/migrations/2023_03_21_053933_tax_calculations_for_invoices.php
@@ -1,5 +1,6 @@
 <?php
 
+use App\Models\Company;
 use App\Libraries\MultiDB;
 use App\Models\CompanyUser;
 use Illuminate\Support\Facades\Schema;
@@ -40,60 +41,36 @@ return new class extends Migration
         Schema::table('schedulers', function (Blueprint $table) {
             $table->string('name', 191)->nullable()->change();
         });
+                    
+        CompanyUser::where('is_admin', 0)->cursor()->each(function ($cu) {
+            $permissions = $cu->permissions;
 
+            if (!$permissions || strlen($permissions) == 0) {
+                $permissions = 'view_reports';
+                $cu->permissions = $permissions;
+                $cu->save();
+            } else {
+                $permissions_array = explode(',', $permissions);
 
-        if (config('ninja.db.multi_db_enabled')) {
-            foreach (MultiDB::$dbs as $db) {
-                CompanyUser::on($db)->where('is_admin',0)->cursor()->each(function ($cu){
+                $permissions_array[] = 'view_reports';
 
-                    $permissions = $cu->permissions;
+                $modified_permissions_string = implode(",", $permissions_array);
 
-                    if (!$permissions || strlen($permissions) == 0) {
-                        $permissions = 'view_reports';
-                        $cu->permissions = $permissions;
-                        $cu->save();
-                    } else {
-                        $permissions_array = explode(',', $permissions);
-
-                        $permissions_array[] = 'view_reports';
-
-                        $modified_permissions_string = implode(",", $permissions_array);
-
-                        $cu->permissions = $modified_permissions_string;
-                        $cu->save();
-                    }
-
-
-                });
+                $cu->permissions = $modified_permissions_string;
+                $cu->save();
             }
-        } else {
-            
-            
-            CompanyUser::where('is_admin', 0)->cursor()->each(function ($cu) {
-                $permissions = $cu->permissions;
+        });
 
-                if (!$permissions || strlen($permissions) == 0) {
-                    $permissions = 'view_reports';
-                    $cu->permissions = $permissions;
-                    $cu->save();
-                } else {
-                    $permissions_array = explode(',', $permissions);
+        Company::query()
+            ->cursor()
+            ->each(function (Company $company) {
+                $settings = $company->settings;
 
-                    $permissions_array[] = 'view_reports';
-
-                    $modified_permissions_string = implode(",", $permissions_array);
-
-                    $cu->permissions = $modified_permissions_string;
-                    $cu->save();
+                if (!property_exists($settings, 'mailgun_endpoint')) {
+                    $company->saveSettings((array)$company->settings, $company);
                 }
             });
-
-
-
-        }
-
-
-
+        
     }
 
     /**