diff --git a/app/Console/Commands/CheckData.php b/app/Console/Commands/CheckData.php
index 2941f2223d5a..e842361dec38 100644
--- a/app/Console/Commands/CheckData.php
+++ b/app/Console/Commands/CheckData.php
@@ -891,7 +891,7 @@ class CheckData extends Command
                 $this->logMessage("Fixing country for # {$client->id}");
             });
 
-            Client::query()->whereNull("settings->currency_id")->cursor()->each(function ($client) {
+            Client::query()->whereNull("settings->currency_id")->orWhereJsonContains('settings', ['currency_id' => ''])->cursor()->each(function ($client) {
                 $settings = $client->settings;
                 $settings->currency_id = (string)$client->company->settings->currency_id;
                 $client->settings = $settings;
diff --git a/app/Http/Controllers/StripeConnectController.php b/app/Http/Controllers/StripeConnectController.php
index 3aa9639a48c0..e2479c62d45f 100644
--- a/app/Http/Controllers/StripeConnectController.php
+++ b/app/Http/Controllers/StripeConnectController.php
@@ -54,8 +54,6 @@ class StripeConnectController extends BaseController
         $redirect_uri = config('ninja.app_url').'/stripe/completed';
         $endpoint = "https://connect.stripe.com/oauth/authorize?response_type=code&client_id={$stripe_client_id}&redirect_uri={$redirect_uri}&scope=read_write&state={$token}";
 
-        \Illuminate\Support\Facades\Cache::pull($token);
-
         return redirect($endpoint);
     }
 
@@ -156,6 +154,8 @@ class StripeConnectController extends BaseController
             $redirect_uri = config('ninja.app_url');
         }
 
+        \Illuminate\Support\Facades\Cache::pull($request->token);
+
         //response here
         return view('auth.connect.completed', ['url' => $redirect_uri]);
         // return redirect($redirect_uri);
diff --git a/lang/en/texts.php b/lang/en/texts.php
index 46ed6f80ebf2..fd5294d1f969 100644
--- a/lang/en/texts.php
+++ b/lang/en/texts.php
@@ -5254,6 +5254,8 @@ $lang = array(
     'paylater' => 'Pay in 4',
     'payment_provider' => 'Payment Provider',
     'select_email_provider' => 'Set your email as the sending user',
+    'purchase_order_items' => 'Purchase Order Items',
+
 );
 
 return $lang;