diff --git a/app/Console/Commands/CreateTestData.php b/app/Console/Commands/CreateTestData.php
index 19744925f012..f8b7a9ce44fd 100644
--- a/app/Console/Commands/CreateTestData.php
+++ b/app/Console/Commands/CreateTestData.php
@@ -329,7 +329,7 @@ class CreateTestData extends Command
                 'company_id' => $company->id,
             ]);
 
-        $this->count = $this->count * 100;
+        $this->count = $this->count * 10;
 
         $this->info('Creating '.$this->count.' clients');
 
diff --git a/app/Factory/RecurringInvoiceToInvoiceFactory.php b/app/Factory/RecurringInvoiceToInvoiceFactory.php
index 54f5c288526d..572f2727d3c5 100644
--- a/app/Factory/RecurringInvoiceToInvoiceFactory.php
+++ b/app/Factory/RecurringInvoiceToInvoiceFactory.php
@@ -47,7 +47,8 @@ class RecurringInvoiceToInvoiceFactory
         $invoice->user_id = $recurring_invoice->user_id;
         $invoice->company_id = $recurring_invoice->company_id;
         $invoice->recurring_id = $recurring_invoice->id;
-
+        $invoice->client_id = $client->id;
+        
         return $invoice;
     }
 }
diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
index 32d28e405066..b29221269590 100644
--- a/app/Http/Controllers/UserController.php
+++ b/app/Http/Controllers/UserController.php
@@ -15,6 +15,7 @@ use App\DataMapper\CompanySettings;
 use App\DataMapper\DefaultSettings;
 use App\Events\User\UserEmailAddressChangedNewEmail;
 use App\Events\User\UserEmailAddressChangedOldEmail;
+use App\Events\User\UserWasCreated;
 use App\Factory\UserFactory;
 use App\Filters\UserFilters;
 use App\Http\Controllers\Traits\VerifiesUserEmail;
@@ -204,6 +205,8 @@ class UserController extends BaseController
 
         $ct = CreateCompanyToken::dispatchNow($company, $user, $user_agent);
 
+        event(new UserWasCreated($user, $company, Ninja::eventVars()));
+
         return $this->itemResponse($user->fresh());
     }
 
diff --git a/app/Listeners/SendVerificationNotification.php b/app/Listeners/SendVerificationNotification.php
index cb4b6ce919dc..b8205f7b7139 100644
--- a/app/Listeners/SendVerificationNotification.php
+++ b/app/Listeners/SendVerificationNotification.php
@@ -50,7 +50,11 @@ class SendVerificationNotification implements ShouldQueue
             $event->user->notify(new VerifyUser($event->user));
 
             Ninja::registerNinjaUser($event->user);
+
         } catch (\Exception $e) {
+            
+            info("I couldn't send the email " . $e->getMessage());
+
         }
     }
 }
diff --git a/app/Repositories/UserRepository.php b/app/Repositories/UserRepository.php
index 16e9d34ddc70..012423b67470 100644
--- a/app/Repositories/UserRepository.php
+++ b/app/Repositories/UserRepository.php
@@ -17,6 +17,7 @@ use App\Factory\CompanyUserFactory;
 use App\Models\CompanyUser;
 use App\Models\User;
 use App\Utils\Ninja;
+use App\Utils\Traits\MakesHash;
 use Illuminate\Http\Request;
 
 /**
@@ -24,6 +25,8 @@ use Illuminate\Http\Request;
  */
 class UserRepository extends BaseRepository
 {
+    use MakesHash;
+
     /**
      * Gets the class name.
      *
@@ -66,6 +69,10 @@ class UserRepository extends BaseRepository
         }
 
         $user->fill($details);
+
+        if(!$user->confirmation_code)
+            $user->confirmation_code = $this->createDbHash(config('database.default'));
+
         $user->account_id = $account->id;
         $user->save();
 
diff --git a/app/Transformers/RecurringInvoiceTransformer.php b/app/Transformers/RecurringInvoiceTransformer.php
index e8af2751ef00..103679abc750 100644
--- a/app/Transformers/RecurringInvoiceTransformer.php
+++ b/app/Transformers/RecurringInvoiceTransformer.php
@@ -85,7 +85,7 @@ class RecurringInvoiceTransformer extends EntityTransformer
             'assigned_user_id' => $this->encodePrimaryKey($invoice->assigned_user_id),
             'amount' => (float) $invoice->amount,
             'balance' => (float) $invoice->balance,
-            'client_id' => (string) $invoice->client_id,
+            'client_id' => (string) $this->encodePrimaryKey($invoice->client_id),
             'vendor_id' => (string) $this->encodePrimaryKey($invoice->vendor_id),
             'status_id' => (string) ($invoice->status_id ?: 1),
             'design_id' => (string) $this->encodePrimaryKey($invoice->design_id),
@@ -136,6 +136,7 @@ class RecurringInvoiceTransformer extends EntityTransformer
             'remaining_cycles' => (int) $invoice->remaining_cycles,
             'recurring_dates' => (array) $invoice->recurringDates(),
             'auto_bill' => (string) $invoice->auto_bill,
+            'due_date_days' => (string) $invoice->due_date_days ?: '',
         ];
     }
 }