diff --git a/app/Http/Livewire/WepaySignup.php b/app/Http/Livewire/WepaySignup.php
index d90b77c18d52..0b2636d60769 100644
--- a/app/Http/Livewire/WepaySignup.php
+++ b/app/Http/Livewire/WepaySignup.php
@@ -13,9 +13,12 @@
 namespace App\Http\Livewire;
 
 use App\Models\Company;
+use App\Models\CompanyGateway;
 use App\Models\User;
+use App\PaymentDrivers\WePayPaymentDriver;
 use Illuminate\Support\Facades\Hash;
 use Livewire\Component;
+use WePay;
 
 class WepaySignup extends Component
 {
@@ -25,6 +28,10 @@ class WepaySignup extends Component
     public $first_name;
     public $last_name;
     public $email;
+    public $company_name;
+    public $country;
+    public $ach;
+    public $wepay_payment_tos_agree;
 
     public $terms;
     public $privacy_policy;
@@ -32,9 +39,13 @@ class WepaySignup extends Component
     public $saved;
 
     protected $rules = [
-        'first_name' => ['sometimes'],
-        'last_name' => ['sometimes'],
+        'first_name' => ['required'],
+        'last_name' => ['required'],
         'email' => ['required', 'email'],
+        'company_name' => ['required'],
+        'country' => ['required'],
+        'ach' => ['sometimes'],
+        'wepay_payment_tos_agree' => ['accepted'],
     ];
 
     public function mount()
@@ -43,6 +54,9 @@ class WepaySignup extends Component
         $company = Company::where('company_key', $this->company_key)->first();
         
         $this->fill([
+            'wepay_payment_tos_agree' => '',
+            'ach' => '',
+            'country' => 'US',
             'user' => $user,
             'first_name' => $user->first_name,
             'last_name' => $user->last_name,
@@ -64,10 +78,61 @@ class WepaySignup extends Component
 
         $data = $this->validate($this->rules);
 
-        // $this->user
-        //     ->fill($data)
-        //     ->save();
+        $this->saved = ctrans('texts.processing');
+
+        $wepay_driver = new WePayPaymentDriver(new CompanyGateway, null, null);
+
+        $wepay_driver->init();
+
+        $user_details = [
+            'client_id' => config('ninja.wepay.client_id'),
+            'client_secret' => config('ninja.wepay.client_secret'),
+            'email' => $data['email'],
+            'first_name' => $data['first_name'],
+            'last_name' => $data['last_name'],
+            'original_ip' => request()->ip(),
+            'original_device' => request()->server('HTTP_USER_AGENT'),
+            'tos_acceptance_time' => time(),
+            'redirect_uri' => route('wepay.process_signup'),
+            'scope' => 'manage_accounts,collect_payments,view_user,preapprove_payments,send_money',
+        ];
+
+        $wepay_user = $wepay_driver->request('user/register/', $user_details);
+
+        $access_token = $wepay_user->access_token;
+
+        $access_token_expires = $wepay_user->expires_in ? (time() + $wepay_user->expires_in) : null;
+
+        $wepay = new WePay($access_token);
+
+            $account_details = [
+                'name' => $data['company_name']),
+                'description' => ctrans('texts.wepay_account_description'),
+                'theme_object' => json_decode({"name":"Invoice Ninja","primary_color":"0b4d78","secondary_color":"0b4d78","background_color":"f8f8f8","button_color":"33b753"}),
+                'callback_uri' => $accountGateway->getWebhookUrl(),
+                'rbits' => $account->present()->rBits,
+                'country' => $data['country'],
+            ];
+
+            if (Input::get('country') == 'CA') {
+                $accountDetails['currencies'] = ['CAD'];
+                $accountDetails['country_options'] = ['debit_opt_in' => boolval(Input::get('debit_cards'))];
+            } elseif (Input::get('country') == 'GB') {
+                $accountDetails['currencies'] = ['GBP'];
+            }
+
+            $wepayAccount = $wepay->request('account/create/', $accountDetails);
+
+            try {
+                $wepay->request('user/send_confirmation/', []);
+                $confirmationRequired = true;
+            } catch (\WePayException $ex) {
+                if ($ex->getMessage() == 'This access_token is already approved.') {
+                    $confirmationRequired = false;
+                } else {
+                    throw $ex;
+                }
+            }
 
-        $this->saved = ctrans('texts.saved_at', ['time' => now()->toTimeString()]);
     }
 }
diff --git a/app/PaymentDrivers/WePayPaymentDriver.php b/app/PaymentDrivers/WePayPaymentDriver.php
index 79253491029c..d6f281893dfe 100644
--- a/app/PaymentDrivers/WePayPaymentDriver.php
+++ b/app/PaymentDrivers/WePayPaymentDriver.php
@@ -59,6 +59,8 @@ class WePayPaymentDriver extends BaseDriver
 
         $this->wepay = new WePay(null);
         
+        return $this;
+        
     }
 
     public function setup(array $data)
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 5a7f470e282d..74f37735eee4 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
@@ -50,17 +50,17 @@
                         <label for="country" class="input-label">@lang('texts.country')</label>
                     
                         <div class="radio">
-                        <input class="form-radio mr-2" type="radio" value="US" name="country" checked>
+                        <input class="form-radio mr-2" type="radio" value="US" name="country" checked wire:model="country">
                         <span>{{ ctrans('texts.country_United States') }}</span>
                         </div>
 
                         <div class="radio">
-                        <input class="form-radio mr-2" type="radio" value="CA" name="country">
+                        <input class="form-radio mr-2" type="radio" value="CA" name="country" wire:model="country">
                         <span>{{ ctrans('texts.country_Canada') }}</span>
                         </div>
 
                         <div class="radio">
-                        <input class="form-radio mr-2" type="radio" value="GB" name="country">
+                        <input class="form-radio mr-2" type="radio" value="GB" name="country" wire:model="country">
                         <span>{{ ctrans('texts.country_United Kingdom') }}</span>
                         </div>
 
@@ -69,7 +69,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">
+                        <input class="switch-input" type="checkbox" name="ach" value="1" wire:model="ach">
                         <span>{{ ctrans('texts.enable_ach')}}</span>
                         </div>
                     </div>
@@ -77,9 +77,14 @@
                     <div class="col-span-6 sm:col-span-4">
                         <label for="country" class="input-label"></label>
                         <div class="checkbox">
-                        <input class="switch-input" type="checkbox" name="wepay_payment_tos_agree">
+                        <input 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')
+                        <div class="validation validation-fail">
+                            {{ $message }}
+                        </div>
+                        @enderror
                     </div>
 
                     <div class="col-span-6 sm:col-span-4">
diff --git a/routes/web.php b/routes/web.php
index 3b3c57457606..60fb651c3a11 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -21,7 +21,7 @@ Route::get('password/reset/{token}', 'Auth\ResetPasswordController@showResetForm
 Route::post('password/reset', 'Auth\ResetPasswordController@reset')->name('password.update');
 
 Route::get('wepay/signup/{token}', 'WePayController@signup')->name('wepay.signup');
-Route::post('wepay/processSignup', 'WePayController@processSignup')->name('wepay.process_signup');
+Route::get('wepay/processSignup', 'WePayController@processSignup')->name('wepay.process_signup');
 
 /*
  * Social authentication