diff --git a/app/Console/Commands/InitLookup.php b/app/Console/Commands/InitLookup.php
index b478a18e37bb..bfb6fa8e3286 100644
--- a/app/Console/Commands/InitLookup.php
+++ b/app/Console/Commands/InitLookup.php
@@ -106,6 +106,7 @@ class InitLookup extends Command
                     LookupUser::create([
                         'lookup_account_id' => $lookupAccount->id,
                         'email' => $user['email'],
+                        'user_id' => $user['user_id'],
                     ]);
                 }
                 foreach ($account['contacts'] as $contact) {
@@ -154,24 +155,34 @@ class InitLookup extends Command
             'tokens' => [],
         ];
 
-        $users = DB::table('users')->whereAccountId($accountId)->orderBy('id')->get(['email']);
+        $users = DB::table('users')->whereAccountId($accountId)->orderBy('id')->get(['email', 'id']);
         foreach ($users as $user) {
-            $data['users'][] = ['email' => $user->email];
+            $data['users'][] = [
+                'email' => $user->email,
+                'user_id' => $user->id,
+            ];
         }
 
         $contacts = DB::table('contacts')->whereAccountId($accountId)->orderBy('id')->get(['contact_key']);
         foreach ($contacts as $contact) {
-            $data['contacts'][] = ['contact_key' => $contact->contact_key];
+            $data['contacts'][] = [
+                'contact_key' => $contact->contact_key,
+            ];
         }
 
         $invitations = DB::table('invitations')->whereAccountId($accountId)->orderBy('id')->get(['invitation_key', 'message_id']);
         foreach ($invitations as $invitation) {
-            $data['invitations'][] = ['invitation_key' => $invitation->invitation_key, 'message_id' => $invitation->message_id];
+            $data['invitations'][] = [
+                'invitation_key' => $invitation->invitation_key,
+                'message_id' => $invitation->message_id,
+            ];
         }
 
         $tokens = DB::table('account_tokens')->whereAccountId($accountId)->orderBy('id')->get(['token']);
         foreach ($tokens as $token) {
-            $data['tokens'][] = ['token' => $token->token];
+            $data['tokens'][] = [
+                'token' => $token->token,
+            ];
         }
 
         return $data;
diff --git a/app/Models/LookupUser.php b/app/Models/LookupUser.php
index 33530bd2bddd..3cb8ce288e45 100644
--- a/app/Models/LookupUser.php
+++ b/app/Models/LookupUser.php
@@ -15,6 +15,7 @@ class LookupUser extends LookupModel
     protected $fillable = [
         'lookup_account_id',
         'email',
+        'user_id',
     ];
 
 }
diff --git a/app/Models/User.php b/app/Models/User.php
index 2474ce2d42f5..243835e180eb 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -415,12 +415,9 @@ class User extends Authenticatable
 
 User::creating(function ($user)
 {
-    if (! $user->registered) {
-        return;
-    }
-
     LookupUser::createNew($user->account->account_key, [
         'email' => $user->email,
+        'user_id' => $user->id,
     ]);
 });
 
diff --git a/database/migrations/2017_04_30_174702_add_multiple_database_support.php b/database/migrations/2017_04_30_174702_add_multiple_database_support.php
index a74c2d2fc758..bad6ec0e0ebb 100644
--- a/database/migrations/2017_04_30_174702_add_multiple_database_support.php
+++ b/database/migrations/2017_04_30_174702_add_multiple_database_support.php
@@ -26,6 +26,11 @@ class AddMultipleDatabaseSupport extends Migration
 
         Schema::table('lookup_users', function ($table) {
             $table->string('email')->change()->unique();
+            $table->unsignedInteger('user_id')->index();
+        });
+
+        Schema::table('lookup_users', function ($table) {
+            $table->unique(['lookup_account_id', 'user_id']);
         });
 
         Schema::table('lookup_contacts', function ($table) {