Merge pull request #5703 from beganovich/v5-1405-improve-client-existence-middleware

(v5) Improve CheckClientExistence.php middleware

app/Http/Middleware/CheckClientExistence.php

@@ -31,6 +31,8 @@ class CheckClientExistence
         $multiple_contacts = ClientContact::query()
             ->where('email', auth('contact')->user()->email)
             ->whereNotNull('email')
+            ->where('email', '<>', '')
+            ->where('account_id', auth('contact')->user()->client->company->account->id)
             ->whereNull('deleted_at')
             ->distinct('company_id')
             ->distinct('email')