diff --git a/app/Http/Livewire/BillingPortalPurchasev2.php b/app/Http/Livewire/BillingPortalPurchasev2.php
index 1a6c1a8ba190..cd70adc27ff5 100644
--- a/app/Http/Livewire/BillingPortalPurchasev2.php
+++ b/app/Http/Livewire/BillingPortalPurchasev2.php
@@ -424,7 +424,7 @@ class BillingPortalPurchasev2 extends Component
         $client_repo = new ClientRepository(new ClientContactRepository());
         $data = [
             'name' => '',
-            'group_id' => $this->encodePrimaryKey($this->subscription->group_id),
+            'group_settings_id' => $this->subscription->group_id,
             'contacts' => [
                 ['email' => $this->email],
             ],
diff --git a/app/Services/Client/PaymentMethod.php b/app/Services/Client/PaymentMethod.php
index 7f7d6c4933bc..4c7d4517d44a 100644
--- a/app/Services/Client/PaymentMethod.php
+++ b/app/Services/Client/PaymentMethod.php
@@ -64,6 +64,9 @@ class PaymentMethod
         if ($company_gateways || $company_gateways == '0') {
             $transformed_ids = $this->transformKeys(explode(',', $company_gateways));
 
+            if($company_gateways == '0')
+                $transformed_ids = [];
+
             $this->gateways = $this->client
                              ->company
                              ->company_gateways
@@ -93,6 +96,11 @@ class PaymentMethod
         if ($company_gateways || $company_gateways == '0') {
             $transformed_ids = $this->transformKeys(explode(',', $company_gateways));
 
+            if($company_gateways == '0') {
+                $transformed_ids = [];
+            }
+
+
             $this->gateways = $this->client
                              ->company
                              ->company_gateways