diff --git a/app/PaymentDrivers/Stripe/ACH.php b/app/PaymentDrivers/Stripe/ACH.php
index 0c34594c18..87f9a533bd 100644
--- a/app/PaymentDrivers/Stripe/ACH.php
+++ b/app/PaymentDrivers/Stripe/ACH.php
@@ -39,6 +39,8 @@ class ACH
 
     public function authorizeView(array $data)
     {
+        $data['gateway'] = $this->stripe;
+
         return render('gateways.stripe.ach.authorize', array_merge($data));
     }
 
@@ -63,7 +65,12 @@ class ACH
 
     public function verificationView(ClientGatewayToken $token)
     {
-        return render('gateways.stripe.ach.verify', compact('token'));
+        $data = [
+            'token' => $token,
+            'gateway' => $this->stripe,
+        ];
+
+        return render('gateways.stripe.ach.verify', $data);
     }
 
     public function processVerification(Request $request, ClientGatewayToken $token)
diff --git a/resources/js/clients/payments/stripe-ach.js b/resources/js/clients/payments/stripe-ach.js
index 156b9ed196..c362a7f065 100644
--- a/resources/js/clients/payments/stripe-ach.js
+++ b/resources/js/clients/payments/stripe-ach.js
@@ -58,7 +58,7 @@ class AuthorizeACH {
         document.getElementById('save-button').disabled = true;
         document.querySelector('#save-button > svg').classList.remove('hidden');
         document.querySelector('#save-button > span').classList.add('hidden');
-        
+
         e.preventDefault();
 
         this.errors.textContent = '';
diff --git a/resources/views/portal/ninja2020/gateways/stripe/ach/authorize.blade.php b/resources/views/portal/ninja2020/gateways/stripe/ach/authorize.blade.php
index 4ee473aeba..128b7384f0 100644
--- a/resources/views/portal/ninja2020/gateways/stripe/ach/authorize.blade.php
+++ b/resources/views/portal/ninja2020/gateways/stripe/ach/authorize.blade.php
@@ -1,7 +1,7 @@
 @extends('portal.ninja2020.layout.payments', ['gateway_title' => 'ACH', 'card_title' => 'ACH'])
 
 @section('gateway_head')
-    <meta name="stripe-publishable-key" content="{{ $gateway->getPublishableKey() }}">
+    <meta name="stripe-publishable-key" content="{{ $gateway->company_gateway->getPublishableKey() }}">
 @endsection
 
 @section('gateway_content')
@@ -13,8 +13,8 @@
 
     <form action="{{ route('client.payment_methods.store', ['method' => App\Models\GatewayType::BANK_TRANSFER]) }}" method="post" id="server_response">
         @csrf
-       
-        <input type="hidden" name="company_gateway_id" value="{{ $gateway->id }}">
+
+        <input type="hidden" name="company_gateway_id" value="{{ $gateway->company_gateway->id }}">
         <input type="hidden" name="gateway_type_id" value="2">
         <input type="hidden" name="gateway_response" id="gateway_response">
         <input type="hidden" name="is_default" id="is_default">
@@ -56,7 +56,7 @@
     @component('portal.ninja2020.components.general.card-element', ['title' => ctrans('texts.routing_number')])
         <input class="input w-full" id="routing-number" type="text" required>
     @endcomponent
-    
+
     @component('portal.ninja2020.components.general.card-element', ['title' => ctrans('texts.account_number')])
         <input class="input w-full" id="account-number" type="text" required>
     @endcomponent
@@ -74,4 +74,4 @@
 @section('gateway_footer')
     <script src="https://js.stripe.com/v3/"></script>
     <script src="{{ asset('js/clients/payments/stripe-ach.js') }}"></script>
-@endsection
\ No newline at end of file
+@endsection
diff --git a/resources/views/portal/ninja2020/gateways/stripe/ach/pay.blade.php b/resources/views/portal/ninja2020/gateways/stripe/ach/pay.blade.php
index c0163635a7..a35a406cb4 100644
--- a/resources/views/portal/ninja2020/gateways/stripe/ach/pay.blade.php
+++ b/resources/views/portal/ninja2020/gateways/stripe/ach/pay.blade.php
@@ -1,29 +1,42 @@
 @extends('portal.ninja2020.layout.payments', ['gateway_title' => 'ACH', 'card_title' => 'ACH'])
 
 @section('gateway_content')
-    @if($token)
+    @if(count($tokens) > 0)
         <div class="alert alert-failure mb-4" hidden id="errors"></div>
-    
+
         @include('portal.ninja2020.gateways.includes.payment_details')
 
         <form action="{{ route('client.payments.response') }}" method="post" id="server-response">
             @csrf
             <input type="hidden" name="company_gateway_id" value="{{ $gateway->getCompanyGatewayId() }}">
             <input type="hidden" name="payment_method_id" value="{{ $payment_method_id }}">
-            <input type="hidden" name="source" value="{{ $token->token }}">
+            <input type="hidden" name="source" value="">
             <input type="hidden" name="amount" value="{{ $amount }}">
             <input type="hidden" name="currency" value="{{ $currency }}">
             <input type="hidden" name="customer" value="{{ $customer->id }}">
             <input type="hidden" name="payment_hash" value="{{ $payment_hash }}">
         </form>
 
-        @component('portal.ninja2020.components.general.card-element', ['title' => ctrans('texts.payment_type')])
-            {{ ctrans('texts.ach') }} ({{ ctrans('texts.bank_transfer') }}) (**** {{ $token->meta->last4 }})
+        @component('portal.ninja2020.components.general.card-element', ['title' => ctrans('texts.pay_with')])
+            @if(count($tokens) > 0)
+                @foreach($tokens as $token)
+                    <label class="mr-4">
+                        <input
+                            type="radio"
+                            data-token="{{ $token->token }}"
+                            name="payment-type"
+                            class="form-radio cursor-pointer toggle-payment-with-token"/>
+                        <span class="ml-1 cursor-pointer">{{ ctrans('texts.bank_transfer') }} (*{{ $token->meta->last4 }})</span>
+                    </label>
+                @endforeach
+            @endisset
         @endcomponent
+
     @else
         @component('portal.ninja2020.components.general.card-element-single', ['title' => 'ACH', 'show_title' => false])
             <span>{{ ctrans('texts.bank_account_not_linked') }}</span>
-            <a class="button button-link text-primary" href="{{ route('client.payment_methods.index') }}">{{ ctrans('texts.add_payment_method') }}</a>
+            <a class="button button-link text-primary"
+               href="{{ route('client.payment_methods.index') }}">{{ ctrans('texts.add_payment_method') }}</a>
         @endcomponent
     @endif
 
@@ -32,7 +45,13 @@
 
 @push('footer')
     <script>
-        document.getElementById('pay-now').addEventListener('click', function() {
+        Array
+            .from(document.getElementsByClassName('toggle-payment-with-token'))
+            .forEach((element) => element.addEventListener('click', (element) => {
+                document.querySelector('input[name=source]').value = element.target.dataset.token;
+            }));
+
+        document.getElementById('pay-now').addEventListener('click', function () {
             document.getElementById('server-response').submit();
         });
     </script>