diff --git a/app/Http/Middleware/SetDomainNameDb.php b/app/Http/Middleware/SetDomainNameDb.php
index 74035b97a49b..260de03f8a7d 100644
--- a/app/Http/Middleware/SetDomainNameDb.php
+++ b/app/Http/Middleware/SetDomainNameDb.php
@@ -60,7 +60,7 @@ class SetDomainNameDb
         else {
 
            $query = [
-                'portal_domain' => $request->getHost(),
+                'portal_domain' => $request->getSchemeAndHttpHost(),
                 'portal_mode' => 'domain',
             ];
 
diff --git a/tests/Feature/Import/ImportCompanyTest.php b/tests/Feature/Import/ImportCompanyTest.php
index d8134c6e5239..16a7621caa4c 100644
--- a/tests/Feature/Import/ImportCompanyTest.php
+++ b/tests/Feature/Import/ImportCompanyTest.php
@@ -61,6 +61,7 @@ class ImportCompanyTest extends TestCase
         $backup_json_file = json_decode(file_get_contents($backup_json_file));
 
         $this->assertTrue(property_exists($backup_json_file, 'app_version'));
+        $this->assertTrue(property_exists($backup_json_file, 'users'));
 
         // User::unguard();