diff --git a/app/Http/Controllers/InvoiceApiController.php b/app/Http/Controllers/InvoiceApiController.php
index dec45b8c0ad3..764a59986660 100644
--- a/app/Http/Controllers/InvoiceApiController.php
+++ b/app/Http/Controllers/InvoiceApiController.php
@@ -60,10 +60,11 @@ class InvoiceApiController extends Controller
         }
 
         if (isset($data['email'])) {
-            $contact = Contact::scope()->with('client')->whereEmail($data['email'])->first();
-            if ($contact) {
-                $client = $contact->client;
-            } else {
+            $client = Client::scope()->whereHas('contacts', function($query) use ($data) {
+                $query->where('email', '=', $data['email']);
+            })->first();
+            
+            if (!$client) {
                 $clientData = ['contact' => ['email' => $data['email']]];
                 foreach (['name', 'private_notes'] as $field) {
                     if (isset($data[$field])) {
diff --git a/app/Http/Middleware/StartupCheck.php b/app/Http/Middleware/StartupCheck.php
index bcf67ef0cef5..4f9672b9919c 100644
--- a/app/Http/Middleware/StartupCheck.php
+++ b/app/Http/Middleware/StartupCheck.php
@@ -1,5 +1,6 @@
 <?php namespace app\Http\Middleware;
 
+use Request;
 use Closure;
 use Utils;
 use App;
diff --git a/app/Http/routes.php b/app/Http/routes.php
index 8ac55f85f620..11977f237886 100644
--- a/app/Http/routes.php
+++ b/app/Http/routes.php
@@ -1,6 +1,5 @@
 <?php
 
-
 /*
 |--------------------------------------------------------------------------
 | Application Routes