diff --git a/app/Livewire/Flow2/PaymentMethod.php b/app/Livewire/Flow2/PaymentMethod.php
index 80de9a8c2b52..796eabb3e773 100644
--- a/app/Livewire/Flow2/PaymentMethod.php
+++ b/app/Livewire/Flow2/PaymentMethod.php
@@ -23,19 +23,47 @@ class PaymentMethod extends Component
 
     public $variables;
 
+    public $methods = [];
+
+    public $isLoading = true;
+
+     public function placeholder()
+    {
+        return <<<'HTML'
+        <div  class="flex items-center justify-center min-h-screen">
+        <svg class="animate-spin h-10 w-10 text-gray-500" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24">
+            <circle class="opacity-25" cx="12" cy="12" r="10" stroke="currentColor" stroke-width="4"></circle>
+            <path class="opacity-75" fill="currentColor" d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z"></path>
+        </svg>         
+        </div>
+        HTML;
+    }
+
     public function mount()
     {
+        $this->isLoading = true;
         $this->invoice = $this->context['invoice'];
         $this->variables = $this->context['variables'];
+
+        MultiDB::setDb($this->invoice->company->db);
+
+        $this->methods = $this->invoice->client->service()->getPaymentMethods($this->invoice->balance);
+
+        if(count($this->methods) == 1) {
+            $this->dispatch('payment-method-selected', company_gateway_id: $this->methods[0]['company_gateway_id'], gateway_type_id: $this->methods[0]['gateway_type_id'], amount: $this->invoice->balance);
+        }
+
+        $this->isLoading=false;
+
     }
 
+
     public function render()
     {
-        
-        MultiDB::setDb($this->invoice->company->db);
+                
+    
+        //If there is only one payment method, skip display and push straight to the form!!
 
-        $methods = $this->invoice->client->service()->getPaymentMethods($this->invoice->balance);
-
-        return render('components.livewire.payment_method-flow2', ['methods' => $methods, 'amount' => $this->invoice->balance]);
+        return render('components.livewire.payment_method-flow2', ['methods' => $this->methods, 'amount' => $this->invoice->balance]);
     }
 }
diff --git a/app/Livewire/InvoicePay.php b/app/Livewire/InvoicePay.php
index 8234c1bb450b..0ae0d0db36b8 100644
--- a/app/Livewire/InvoicePay.php
+++ b/app/Livewire/InvoicePay.php
@@ -116,6 +116,10 @@ class InvoicePay extends Component
         $client = $invite->contact->client;
         $variables = ($invite && auth()->guard('contact')->user()->client->getSetting('show_accept_invoice_terms')) ? (new HtmlEngine($invite))->generateLabelsAndValues() : false;
         $settings = $client->getMergedSettings();
+
+        $this->terms_accepted = !$settings->show_accept_invoice_terms;
+        $this->signature_accepted = !$settings->require_invoice_signature;
+        
         $this->context['variables'] = $variables;
         $this->context['invoice'] = $invite->invoice;
         $this->context['settings'] = $settings;
diff --git a/resources/views/portal/ninja2020/components/livewire/payment_method-flow2.blade.php b/resources/views/portal/ninja2020/components/livewire/payment_method-flow2.blade.php
index 464e9f4fefb8..4d2418971b56 100644
--- a/resources/views/portal/ninja2020/components/livewire/payment_method-flow2.blade.php
+++ b/resources/views/portal/ninja2020/components/livewire/payment_method-flow2.blade.php
@@ -1,18 +1,26 @@
-<div class="flex flex-col space-y-4 p-4">
+<div class="flex flex-col space-y-4 p-4" x-data="{ isLoading: true }">
+     
+    <div x-show="isLoading" class="flex items-center justify-center min-h-screen">
+        <svg class="animate-spin h-10 w-10 text-gray-500" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24">
+            <circle class="opacity-25" cx="12" cy="12" r="10" stroke="currentColor" stroke-width="4"></circle>
+            <path class="opacity-75" fill="currentColor" d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z"></path>
+        </svg>
+    </div>
+    
     @foreach($methods as $index => $method)
 
-        <button 
-            class="button button-primary bg-primary payment-method flex items-center justify-center relative py-4" 
-            @click="$wire.dispatch('payment-method-selected', { company_gateway_id: {{ $method['company_gateway_id'] }}, gateway_type_id: {{ $method['gateway_type_id'] }}, amount: {{ $amount }} })">
-            <svg class="animate-spin h-5 w-5 text-white hidden" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24">
-                <circle class="opacity-25" cx="12" cy="12" r="10" stroke="currentColor" stroke-width="4"></circle>
-                <path class="opacity-75" fill="currentColor" d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z"></path>
-            </svg>
-            <span>{{ $method['label'] }}</span>
-        </button>
+            <button 
+                class="button button-primary bg-primary payment-method flex items-center justify-center relative py-4" 
+                @click="$wire.dispatch('payment-method-selected', { company_gateway_id: {{ $method['company_gateway_id'] }}, gateway_type_id: {{ $method['gateway_type_id'] }}, amount: {{ $amount }} })">
+                <svg class="animate-spin h-5 w-5 text-white hidden" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24">
+                    <circle class="opacity-25" cx="12" cy="12" r="10" stroke="currentColor" stroke-width="4"></circle>
+                    <path class="opacity-75" fill="currentColor" d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z"></path>
+                </svg>
+                <span>{{ $method['label'] }}</span>
+            </button>
 
     @endforeach
-
+    
 
     @script
     <script>
diff --git a/resources/views/portal/ninja2020/gateways/stripe/credit_card/livewire_pay.blade.php b/resources/views/portal/ninja2020/gateways/stripe/credit_card/livewire_pay.blade.php
index 3b2478d1466e..0ffaeba55c58 100644
--- a/resources/views/portal/ninja2020/gateways/stripe/credit_card/livewire_pay.blade.php
+++ b/resources/views/portal/ninja2020/gateways/stripe/credit_card/livewire_pay.blade.php
@@ -1,5 +1,4 @@
 <div class="bg-white">
-
     @if($stripe_account_id)
         <meta name="stripe-account-id" content="{{ $stripe_account_id }}">
         <meta name="stripe-publishable-key" content="{{ config('ninja.ninja_stripe_publishable_key') }}">