diff --git a/app/PaymentDrivers/Forte/ACH.php b/app/PaymentDrivers/Forte/ACH.php
index 59600ea68454..4795f956d6d0 100644
--- a/app/PaymentDrivers/Forte/ACH.php
+++ b/app/PaymentDrivers/Forte/ACH.php
@@ -105,8 +105,8 @@ class ACH
                     "sec_code":"PPD",
                 },
                 "billing_address":{
-                    "first_name": "'.auth()->user()->client->name.'",
-                    "last_name": "'.auth()->user()->client->name.'"
+                    "first_name": "'.$this->forte->client->name.'",
+                    "last_name": "'.$this->forte->client->name.'"
                 },
                 "echeck":{
                    "one_time_token":"'.$request->payment_token.'"
diff --git a/app/PaymentDrivers/Forte/CreditCard.php b/app/PaymentDrivers/Forte/CreditCard.php
index f5d96f78b5c9..4448fa8028c7 100644
--- a/app/PaymentDrivers/Forte/CreditCard.php
+++ b/app/PaymentDrivers/Forte/CreditCard.php
@@ -105,8 +105,8 @@ class CreditCard
                      "authorization_amount":'.$payment_hash->data->total->amount_with_fee.',
                      "service_fee_amount":'.$payment_hash->data->total->fee_total.',
                      "billing_address":{
-                        "first_name":"'.auth()->user()->client->name.'",
-                        "last_name":"'.auth()->user()->client->name.'"
+                        "first_name":"'.$this->forte->client->name.'",
+                        "last_name":"'.$this->forte->client->name.'"
                      },
                      "card":{
                         "one_time_token":"'.$request->payment_token.'"
diff --git a/resources/views/portal/ninja2020/gateways/forte/ach/pay.blade.php b/resources/views/portal/ninja2020/gateways/forte/ach/pay.blade.php
index 1634ba966555..524bdb7e41ff 100644
--- a/resources/views/portal/ninja2020/gateways/forte/ach/pay.blade.php
+++ b/resources/views/portal/ninja2020/gateways/forte/ach/pay.blade.php
@@ -19,40 +19,40 @@
         <input type="hidden" name="dataDescriptor" id="dataDescriptor"/>
         <input type="hidden" name="token" id="token"/>
         <input type="hidden" name="store_card" id="store_card"/>
-
-        <div id="forte_errors"></div>
-
-        @component('portal.ninja2020.components.general.card-element', ['title' => ctrans('texts.payment_type')])
-            Bank Transfer
-        @endcomponent
-
-        @include('portal.ninja2020.gateways.includes.payment_details')
-
-        @component('portal.ninja2020.components.general.card-element', ['title' => 'Pay with Bank Transfer'])
-            <input type="hidden" name="payment_token" id="payment_token">
-            <div class="bg-white px-4 py-2 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6"
-                style="display: flex!important; justify-content: center!important;">
-                <input class="input w-full" id="routing-number" type="text" placeholder="{{ctrans('texts.routing_number')}}" required>
-            </div>
-            <div class="bg-white px-4 py-2 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6"
-                style="display: flex!important; justify-content: center!important;">
-                <input class="input w-full" id="account-number" type="text" placeholder="{{ctrans('texts.account_number')}}" required>
-            </div>
-        @endcomponent
-        <div class="bg-white px-4 py-5 flex justify-end">
-            <button type="button"
-            onclick="submitPay()"
-                class="button button-primary bg-primary {{ $class ?? '' }}">
-                    <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>{{ $slot ?? ctrans('texts.pay_now') }}</span>
-            </button>
-        </div>
         <input type="submit" style="display: none" id="form_btn">
     </form>
 
+    <div id="forte_errors"></div>
+
+    @component('portal.ninja2020.components.general.card-element', ['title' => ctrans('texts.payment_type')])
+        Bank Transfer
+    @endcomponent
+
+    @include('portal.ninja2020.gateways.includes.payment_details')
+
+    @component('portal.ninja2020.components.general.card-element', ['title' => 'Pay with Bank Transfer'])
+        <input type="hidden" name="payment_token" id="payment_token">
+        <div class="bg-white px-4 py-2 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6"
+            style="display: flex!important; justify-content: center!important;">
+            <input class="input w-full" id="routing-number" type="text" placeholder="{{ctrans('texts.routing_number')}}" required>
+        </div>
+        <div class="bg-white px-4 py-2 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6"
+            style="display: flex!important; justify-content: center!important;">
+            <input class="input w-full" id="account-number" type="text" placeholder="{{ctrans('texts.account_number')}}" required>
+        </div>
+    @endcomponent
+    <div class="bg-white px-4 py-5 flex justify-end">
+        <button type="button"
+        onclick="submitPay()"
+            class="button button-primary bg-primary {{ $class ?? '' }}">
+                <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>{{ $slot ?? ctrans('texts.pay_now') }}</span>
+        </button>
+    </div>
+
 @endsection
 
 @section('gateway_footer')
diff --git a/resources/views/portal/ninja2020/gateways/forte/credit_card/pay.blade.php b/resources/views/portal/ninja2020/gateways/forte/credit_card/pay.blade.php
index 3d6df3deca32..ac47cda057cf 100644
--- a/resources/views/portal/ninja2020/gateways/forte/credit_card/pay.blade.php
+++ b/resources/views/portal/ninja2020/gateways/forte/credit_card/pay.blade.php
@@ -16,6 +16,8 @@
 @section('gateway_content')
     <form action="{{ route('client.payments.response') }}" method="post" id="server_response">
         @csrf
+        <input type="hidden" name="card_brand" id="card_brand">
+        <input type="hidden" name="payment_token" id="payment_token">
         <input type="hidden" name="payment_hash" value="{{ $payment_hash }}">
         <input type="hidden" name="company_gateway_id" value="{{ $gateway->forte->company_gateway->id }}">
         <input type="hidden" name="payment_method_id" value="{{$payment_method_id}}">
@@ -24,35 +26,33 @@
         <input type="hidden" name="dataDescriptor" id="dataDescriptor"/>
         <input type="hidden" name="token" id="token"/>
         <input type="hidden" name="store_card" id="store_card"/>
-
-        <div id="forte_errors"></div>
-
-        @component('portal.ninja2020.components.general.card-element', ['title' => ctrans('texts.payment_type')])
-            {{ ctrans('texts.credit_card') }}
-        @endcomponent
-
-        @include('portal.ninja2020.gateways.includes.payment_details')
-
-        @component('portal.ninja2020.components.general.card-element', ['title' => 'Pay with Credit Card'])
-            <input type="hidden" name="card_brand" id="card_brand">
-            <input type="hidden" name="payment_token" id="payment_token">
-            @include('portal.ninja2020.gateways.forte.includes.credit_card')
-
-        @endcomponent
-        <div class="bg-white px-4 py-5 flex justify-end">
-            <button type="button"
-            onclick="submitPay()"
-                class="button button-primary bg-primary {{ $class ?? '' }}">
-                    <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>{{ $slot ?? ctrans('texts.pay_now') }}</span>
-            </button>
-        </div>
         <input type="submit" style="display: none" id="form_btn">
     </form>
 
+    <div id="forte_errors"></div>
+
+    @component('portal.ninja2020.components.general.card-element', ['title' => ctrans('texts.payment_type')])
+        {{ ctrans('texts.credit_card') }}
+     @endcomponent
+
+    @include('portal.ninja2020.gateways.includes.payment_details')
+
+    @component('portal.ninja2020.components.general.card-element', ['title' => 'Pay with Credit Card'])
+       @include('portal.ninja2020.gateways.forte.includes.credit_card')
+    @endcomponent
+
+    <div class="bg-white px-4 py-5 flex justify-end">
+        <button type="button"
+        onclick="submitPay()"
+            class="button button-primary bg-primary {{ $class ?? '' }}">
+                <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>{{ $slot ?? ctrans('texts.pay_now') }}</span>
+        </button>
+    </div>
+
 @endsection
 
 @section('gateway_footer')