diff --git a/app/Http/Controllers/AccountGatewayController.php b/app/Http/Controllers/AccountGatewayController.php
index 56f2dc5d746a..35bdefe13284 100644
--- a/app/Http/Controllers/AccountGatewayController.php
+++ b/app/Http/Controllers/AccountGatewayController.php
@@ -372,7 +372,7 @@ class AccountGatewayController extends BaseController
             'tos_agree' => 'required',
             'first_name' => 'required',
             'last_name' => 'required',
-            'email' => 'required',
+            'email' => 'required|email',
         ];
 
         if (WEPAY_ENABLE_CANADA) {
@@ -387,6 +387,13 @@ class AccountGatewayController extends BaseController
                 ->withInput();
         }
 
+        if (! $user->email) {
+            $user->email = trim(Input::get('email'));
+            $user->first_name = trim(Input::get('first_name'));
+            $user->last_name = trim(Input::get('last_name'));
+            $user->save();
+        }
+
         try {
             $wepay = Utils::setupWePay();