diff --git a/resources/views/portal/ninja2020/gateways/authorize/credit_card_payment.blade.php b/resources/views/portal/ninja2020/gateways/authorize/credit_card_payment.blade.php
index c03aa8e185fb..661bba3e330e 100644
--- a/resources/views/portal/ninja2020/gateways/authorize/credit_card_payment.blade.php
+++ b/resources/views/portal/ninja2020/gateways/authorize/credit_card_payment.blade.php
@@ -58,14 +58,32 @@
                             </div>
         
                             @include('portal.ninja2020.gateways.authorize.credit_card')
-
-                            <div class="bg-gray-50 px-4 py-5 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6">
+                            
+                            <div class="{{ ($gateway->token_billing == 'optin' || $gateway->token_billing == 'optout') ? 'sm:grid' : 'hidden' }} bg-gray-50 px-4 py-5 sm:grid-cols-3 sm:gap-4 sm:px-6">
                                 <dt class="text-sm leading-5 font-medium text-gray-500">
                                     {{ ctrans('texts.token_billing_checkbox') }}
                                 </dt>
                                 <dd class="mt-1 text-sm leading-5 text-gray-900 sm:mt-0 sm:col-span-2">
-                                    <input type="checkbox" class="form-checkbox" name="store_card_checkbox"
-                                           id="store_card_checkbox"/>
+                                    <label class="mr-4">
+                                        <input 
+                                            type="radio"
+                                            class="form-radio cursor-pointer" 
+                                            name="store_card_checkbox" 
+                                            id="proxy_is_default"
+                                            value="true"
+                                            {{ ($gateway->token_billing == 'always' || $gateway->token_billing == 'optout') ? 'checked' : '' }} />
+                                        <span class="ml-1 cursor-pointer">{{ ctrans('texts.yes') }}</span>
+                                    </label>
+                                    <label>
+                                        <input 
+                                            type="radio" 
+                                            class="form-radio cursor-pointer" 
+                                            name="store_card_checkbox" 
+                                            id="proxy_is_default" 
+                                            value="false"
+                                            {{ ($gateway->token_billing == 'off' || $gateway->token_billing == 'optin') ? 'checked' : '' }} />
+                                        <span class="ml-1 cursor-pointer">{{ ctrans('texts.no') }}</span>
+                                    </label>
                                 </dd>
                             </div>
                             <div class="bg-white px-4 py-5 flex justify-end">