diff --git a/app/Http/Livewire/WepaySignup.php b/app/Http/Livewire/WepaySignup.php
index 783bff6f33da..ba7c915e0ce7 100644
--- a/app/Http/Livewire/WepaySignup.php
+++ b/app/Http/Livewire/WepaySignup.php
@@ -12,6 +12,7 @@
 
 namespace App\Http\Livewire;
 
+use App\Factory\CompanyGatewayFactory;
 use App\Models\Company;
 use App\Models\CompanyGateway;
 use App\Models\User;
@@ -48,6 +49,7 @@ class WepaySignup extends Component
         'country' => ['required'],
         'ach' => ['sometimes'],
         'wepay_payment_tos_agree' => ['accepted'],
+        'debit_cards' => ['sometimes'],
     ];
 
     public function mount()
@@ -83,14 +85,24 @@ class WepaySignup extends Component
                             ->firstOrNew();
 
         if(!$cg->id) {
-
+            $cg = CompanyGatewayFactory::create($this->company->id, $this->user->id);
+            $cg->gateway_key = '8fdeed552015b3c7b44ed6c8ebd9e992';
+            $cg->require_cvv = false;
+            $cg->require_billing_address = false;
+            $cg->require_shipping_address = false;
+            $cg->update_details = false;
+            $cg->config = encrypt(config('ninja.testvars.checkout'));
+            $cg->save();
         }
 
         $data = $this->validate($this->rules);
 
+
+// nlog($data);
+
         $this->saved = ctrans('texts.processing');
 
-        $wepay_driver = new WePayPaymentDriver(new CompanyGateway, null, null);
+        $wepay_driver = new WePayPaymentDriver($cg, null, null);
 
         $wepay_driver->init();
 
diff --git a/app/PaymentDrivers/WePayPaymentDriver.php b/app/PaymentDrivers/WePayPaymentDriver.php
index d6f281893dfe..414d519b591f 100644
--- a/app/PaymentDrivers/WePayPaymentDriver.php
+++ b/app/PaymentDrivers/WePayPaymentDriver.php
@@ -48,7 +48,7 @@ class WePayPaymentDriver extends BaseDriver
         if (WePay::getEnvironment() == 'none') {
             
             if(config('ninja.wepay.environment') == 'staging')
-                WePay::useStaing(config('ninja.wepay.client_id'), config('ninja.wepay.client_secret'));
+                WePay::useStaging(config('ninja.wepay.client_id'), config('ninja.wepay.client_secret'));
             else
                 WePay::useProduction(config('ninja.wepay.client_id'), config('ninja.wepay.client_secret'));
 
diff --git a/resources/views/portal/ninja2020/gateways/wepay/signup/wepay-signup.blade.php b/resources/views/portal/ninja2020/gateways/wepay/signup/wepay-signup.blade.php
index 93f13f435579..b87f25d3ad8c 100644
--- a/resources/views/portal/ninja2020/gateways/wepay/signup/wepay-signup.blade.php
+++ b/resources/views/portal/ninja2020/gateways/wepay/signup/wepay-signup.blade.php
@@ -76,7 +76,7 @@
                             <label for="country" class="input-label">@lang('texts.debit_cards')</label>
 
                             <div class="checkbox">
-                                <input class="form-checkbox cursor-pointer mr-2" type="checkbox">
+                                <input class="form-checkbox cursor-pointer mr-2" type="checkbox" name="debit_cards" value="1" wire:model="debit_cards">
                                 <span>{{ ctrans('texts.accept_debit_cards') }}</span>
                             </div>
                         </div>
@@ -85,7 +85,7 @@
                     <div class="col-span-6 sm:col-span-4">
                         <label for="country" class="input-label">@lang('texts.ach')</label>
                         <div class="checkbox">
-                            <input class="switch-input" type="checkbox" name="ach" value="1" wire:model="ach">
+                            <input class="form-checkbox cursor-pointer mr-2" type="checkbox" name="ach" value="1" wire:model="ach">
                             <span>{{ ctrans('texts.enable_ach')}}</span>
                         </div>
                     </div>
@@ -93,8 +93,7 @@
                     <div class="col-span-6 sm:col-span-4">
                         <label for="country" class="input-label"></label>
                         <div class="checkbox">
-                            <input type="checkbox" name="wepay_payment_tos_agree" value="1"
-                                   wire:model="wepay_payment_tos_agree">
+                            <input class="form-checkbox cursor-pointer mr-2" type="checkbox" name="wepay_payment_tos_agree" value="1" wire:model="wepay_payment_tos_agree">
                             <span>{!! ctrans('texts.wepay_payment_tos_agree', ['terms' => $terms, 'privacy_policy' => $privacy_policy]) !!}</span>
                         </div>
                         @error('wepay_payment_tos_agree')
@@ -104,6 +103,10 @@
                         @enderror
                     </div>
 
+                    <div class="col-span-6 sm:col-span-4">
+                        <span><i>{{ ctrans('texts.standard_fees_apply')}}</i></span>
+                    </div>
+
                     <div class="col-span-6 {{ $country != 'CA' ? 'hidden' : 'block' }}">
                         <table id="canadaFees" width="100%" class="min-w-full"
                                style="border: 1px solid black; margin-bottom: 40px; display: table;">
@@ -267,9 +270,7 @@
                         </table>
                     </div>
 
-                    <div class="col-span-6 sm:col-span-4">
-                        <span><i>{{ ctrans('texts.standard_fees_apply')}}</i></span>
-                    </div>
+
                 </div>
             </div>