diff --git a/app/Models/Contact.php b/app/Models/Contact.php
index 2f20a8f8aa10..4a73944549db 100644
--- a/app/Models/Contact.php
+++ b/app/Models/Contact.php
@@ -131,6 +131,21 @@ class Contact extends EntityModel implements AuthenticatableContract, CanResetPa
         }
     }
 
+    /**
+     * @return mixed|string
+     */
+    public function getSearchName()
+    {
+        $name = $this->getFullName();
+        $email = $this->email;
+
+        if ($name && $email) {
+            return sprintf('%s <%s>', $name, $email);
+        } else {
+            return $name ?: $email;
+        }
+    }
+
     /**
      * @param $contact_key
      *
diff --git a/app/Ninja/Repositories/AccountRepository.php b/app/Ninja/Repositories/AccountRepository.php
index cacfdd2cdf2a..236f340e164c 100644
--- a/app/Ninja/Repositories/AccountRepository.php
+++ b/app/Ninja/Repositories/AccountRepository.php
@@ -193,7 +193,7 @@ class AccountRepository
 
             foreach ($client->contacts as $contact) {
                 $data['contacts'][] = [
-                    'value' => $contact->getDisplayName(),
+                    'value' => $contact->getSearchName(),
                     'tokens' => implode(',', [$contact->first_name, $contact->last_name, $contact->email, $contact->phone]),
                     'url' => $client->present()->url,
                 ];