diff --git a/app/Livewire/BillingPortal/Authentication/ClientRegisterService.php b/app/Livewire/BillingPortal/Authentication/ClientRegisterService.php
index f04f2b3ca1e1..bcb576d70e4c 100644
--- a/app/Livewire/BillingPortal/Authentication/ClientRegisterService.php
+++ b/app/Livewire/BillingPortal/Authentication/ClientRegisterService.php
@@ -51,9 +51,9 @@ class ClientRegisterService
             }
         }
 
-        if ($this->company->settings->client_portal_terms || $this->company->settings->client_portal_privacy_policy) {
-            $rules['terms'] = ['required'];
-        }
+        // if ($this->company->settings->client_portal_terms || $this->company->settings->client_portal_privacy_policy) {
+        //     $rules['terms'] = ['required'];
+        // }
 
         foreach ($this->additional as $field) {
             if ($field['visible'] ?? true) {
diff --git a/app/Livewire/BillingPortal/Authentication/RegisterOrLogin.php b/app/Livewire/BillingPortal/Authentication/RegisterOrLogin.php
index f3d84177507d..4cbecca75207 100644
--- a/app/Livewire/BillingPortal/Authentication/RegisterOrLogin.php
+++ b/app/Livewire/BillingPortal/Authentication/RegisterOrLogin.php
@@ -202,6 +202,10 @@ class RegisterOrLogin extends Component
 
         $this->register_fields = [...collect($this->subscription->company->client_registration_fields ?? [])->toArray()];
 
+        // if ($this->subscription->company->settings->client_portal_terms || $this->subscription->company->settings->client_portal_privacy_policy) {
+        //     $this->register_fields[] = ['key' => 'terms', 'required' => true, 'visible' => 'true'];
+        // }
+
         $first_gateway = collect($this->subscription->company->company_gateways)
             ->sortBy('sort_order')
             ->first();
diff --git a/app/PaymentDrivers/StripePaymentDriver.php b/app/PaymentDrivers/StripePaymentDriver.php
index 92f98bb5b669..c2d74d97f7a4 100644
--- a/app/PaymentDrivers/StripePaymentDriver.php
+++ b/app/PaymentDrivers/StripePaymentDriver.php
@@ -680,7 +680,7 @@ class StripePaymentDriver extends BaseDriver
         }
 
         if ($request->type === 'payment_intent.processing') {
-            PaymentIntentProcessingWebhook::dispatch($request->data, $request->company_key, $this->company_gateway->id)->delay(now()->addSeconds(2));
+            PaymentIntentProcessingWebhook::dispatch($request->data, $request->company_key, $this->company_gateway->id)->delay(now()->addSeconds(rand(10,12)));
             return response()->json([], 200);
         }
 
@@ -692,7 +692,7 @@ class StripePaymentDriver extends BaseDriver
         }
 
         if ($request->type === 'payment_intent.partially_funded') {
-            PaymentIntentPartiallyFundedWebhook::dispatch($request->data, $request->company_key, $this->company_gateway->id)->delay(now()->addSeconds(rand(5, 10)));
+            PaymentIntentPartiallyFundedWebhook::dispatch($request->data, $request->company_key, $this->company_gateway->id)->delay(now()->addSeconds(rand(10, 15)));
 
             return response()->json([], 200);
         }
@@ -715,7 +715,6 @@ class StripePaymentDriver extends BaseDriver
                         ->first();
                 } else {
                     $payment = Payment::query()
-                        // ->where('company_id', $request->getCompany()->id)
                         ->where('transaction_reference', $transaction['id'])
                         ->first();
                 }