diff --git a/app/Ninja/Repositories/AccountRepository.php b/app/Ninja/Repositories/AccountRepository.php
index 27be4232e4fb..559e1a75c74c 100644
--- a/app/Ninja/Repositories/AccountRepository.php
+++ b/app/Ninja/Repositories/AccountRepository.php
@@ -336,11 +336,15 @@ class AccountRepository
         if ($account) {
             return $account;
         } else {
+            $company = new Company();
+            $company->save();
+
             $account = new Account();
             $account->name = 'Invoice Ninja';
             $account->work_email = 'contact@invoiceninja.com';
             $account->work_phone = '(800) 763-1948';
             $account->account_key = NINJA_ACCOUNT_KEY;
+            $account->company_id = $company->id;
             $account->save();
 
             $random = str_random(RANDOM_KEY_LENGTH);