diff --git a/VERSION.txt b/VERSION.txt
index f68965058b73..1dbc497b7583 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -1 +1 @@
-5.3.32
\ No newline at end of file
+5.3.33
\ No newline at end of file
diff --git a/app/Http/Controllers/BaseController.php b/app/Http/Controllers/BaseController.php
index 065d6a1aa6f8..938b69ed3fb3 100644
--- a/app/Http/Controllers/BaseController.php
+++ b/app/Http/Controllers/BaseController.php
@@ -346,7 +346,8 @@ class BaseController extends Controller
 
             },
             'company.subscriptions'=> function ($query) use($updated_at, $user) {
-              $query->where('updated_at', '>=', $updated_at);
+              // $query->where('updated_at', '>=', $updated_at);
+                $query->whereNotNull('updated_at');
 
               if(!$user->isAdmin())
                   $query->where('subscriptions.user_id', $user->id);
diff --git a/app/Http/Livewire/BillingPortalPurchase.php b/app/Http/Livewire/BillingPortalPurchase.php
index 3aa58383834c..b7ed13d2b4f5 100644
--- a/app/Http/Livewire/BillingPortalPurchase.php
+++ b/app/Http/Livewire/BillingPortalPurchase.php
@@ -345,14 +345,6 @@ class BillingPortalPurchase extends Component
             'quantity' => $this->quantity,
         ];
 
-        $this->invoice = $this->subscription
-            ->service()
-            ->createInvoice($data)
-            ->service()
-            ->markSent()
-            ->fillDefaults()
-            ->save();
-
         $is_eligible = $this->subscription->service()->isEligible($this->contact);
 
         if (is_array($is_eligible) && $is_eligible['message'] != 'Success') {
@@ -363,6 +355,14 @@ class BillingPortalPurchase extends Component
             return;
         }
 
+        $this->invoice = $this->subscription
+            ->service()
+            ->createInvoice($data)
+            ->service()
+            ->markSent()
+            ->fillDefaults()
+            ->save();
+
         Cache::put($this->hash, [
             'subscription_id' => $this->subscription->id,
             'email' => $this->email ?? $this->contact->email,
diff --git a/config/ninja.php b/config/ninja.php
index 4dbd4f9de9d8..98fbe0157755 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.3.32',
-    'app_tag' => '5.3.32',
+    'app_version' => '5.3.33',
+    'app_tag' => '5.3.33',
     'minimum_client_version' => '5.0.16',
     'terms_version' => '1.0.1',
     'api_secret' => env('API_SECRET', ''),
diff --git a/public/images/welcome/email.svg b/public/images/welcome/email.svg
new file mode 100644
index 000000000000..c6609fb4da72
--- /dev/null
+++ b/public/images/welcome/email.svg
@@ -0,0 +1 @@
+<svg version="1.2" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" overflow="visible" preserveAspectRatio="none" viewBox="0 0 35 28" width="35" height="28"><g transform="translate(0, 0)"><g transform="translate(-6.938893903907228e-17, 0) rotate(0)"><path d="M31.5,0h-28c-1.925,0 -3.4825,1.575 -3.4825,3.5l-0.0175,21c0,1.925 1.575,3.5 3.5,3.5h28c1.925,0 3.5,-1.575 3.5,-3.5v-21c0,-1.925 -1.575,-3.5 -3.5,-3.5zM31.5,7l-14,8.75l-14,-8.75v-3.5l14,8.75l14,-8.75z" style="stroke-width: 0; stroke-linecap: butt; stroke-linejoin: miter; fill: rgb(18, 18, 18);" vector-effect="non-scaling-stroke"/></g><defs><path id="path-1637627912051353" d="M31.5,0h-28c-1.925,0 -3.4825,1.575 -3.4825,3.5l-0.0175,21c0,1.925 1.575,3.5 3.5,3.5h28c1.925,0 3.5,-1.575 3.5,-3.5v-21c0,-1.925 -1.575,-3.5 -3.5,-3.5zM31.5,7l-14,8.75l-14,-8.75v-3.5l14,8.75l14,-8.75z" vector-effect="non-scaling-stroke"/></defs></g></svg>
\ No newline at end of file
diff --git a/public/images/welcome/gateways.png b/public/images/welcome/gateways.png
new file mode 100644
index 000000000000..fa9414a26416
Binary files /dev/null and b/public/images/welcome/gateways.png differ
diff --git a/public/images/welcome/money_logo.png b/public/images/welcome/money_logo.png
new file mode 100644
index 000000000000..8531d97963f8
Binary files /dev/null and b/public/images/welcome/money_logo.png differ