diff --git a/app/Http/Controllers/Auth/ContactForgotPasswordController.php b/app/Http/Controllers/Auth/ContactForgotPasswordController.php
index 84a33915ec2a..9481a7d9d277 100644
--- a/app/Http/Controllers/Auth/ContactForgotPasswordController.php
+++ b/app/Http/Controllers/Auth/ContactForgotPasswordController.php
@@ -60,7 +60,11 @@ class ContactForgotPasswordController extends Controller
     {
         $account_id = $request->has('account_id') ? $request->get('account_id') : 1;
         $account = Account::find($account_id);
-        $company = $account->companies->first();
+
+        if($request->has('company_key'))
+            $company = Company::where('company_key', $request->input('company_key'))->first();
+        else
+            $company = $account->companies->first();
 
         if(!$account)
             $account = Account::first();
@@ -93,7 +97,9 @@ class ContactForgotPasswordController extends Controller
 
         // $user = MultiDB::hasContact($request->input('email'));
         $company = Company::where('company_key', $request->input('company_key'))->first();
-        $contact = MultiDB::findContact(['company_id' => $company->id, 'email' => $request->input('email')]);
+        //$contact = MultiDB::findContact(['company_id' => $company->id, 'email' => $request->input('email')]);
+        nlog(['company_id' => $company->id, 'email' => $request->input('email')]);
+        $contact = ClientContact::where(['company_id' => $company->id, 'email' => $request->input('email')])->first();
 
         $response = false;
 
diff --git a/app/Http/Middleware/SetDomainNameDb.php b/app/Http/Middleware/SetDomainNameDb.php
index ab49e9ef15dd..8d035f04af9a 100644
--- a/app/Http/Middleware/SetDomainNameDb.php
+++ b/app/Http/Middleware/SetDomainNameDb.php
@@ -49,7 +49,7 @@ class SetDomainNameDb
             ];
 
             if($company = MultiDB::findAndSetDbByDomain($query)){
-                $request->request->add(['account_id' => $company->account_id]);
+                $request->request->add(['account_id' => $company->account_id, 'company_key' => $company->company_key]);
             }
             else 
             {
@@ -71,7 +71,7 @@ class SetDomainNameDb
             ];
 
             if($company = MultiDB::findAndSetDbByDomain($query)){
-                $request->request->add(['account_id' => $company->account_id]);
+                $request->request->add(['account_id' => $company->account_id, 'company_key' => $company->company_key]);
             }
             else
             {