diff --git a/app/Http/Controllers/Auth/ContactRegisterController.php b/app/Http/Controllers/Auth/ContactRegisterController.php
index a9201f634e13..d6767217827c 100644
--- a/app/Http/Controllers/Auth/ContactRegisterController.php
+++ b/app/Http/Controllers/Auth/ContactRegisterController.php
@@ -24,7 +24,13 @@ class ContactRegisterController extends Controller
 
     public function register(RegisterRequest $request)
     {
-        $company = Company::where('company_key', $request->company_key)->firstOrFail();
+        if ($request->subdomain) {
+            $company = Company::where('subdomain', $request->subdomain)->firstOrFail();
+        }
+
+        if ($request->company_key) {
+            $company = Company::where('company_key', $request->company_key)->firstOrFail();
+        }
 
         $client = factory(Client::class)->create([
             'user_id' => $user->id, /** @wip */
diff --git a/app/Http/Middleware/ContactRegister.php b/app/Http/Middleware/ContactRegister.php
index a01cf432cbdb..738e80efd526 100644
--- a/app/Http/Middleware/ContactRegister.php
+++ b/app/Http/Middleware/ContactRegister.php
@@ -26,7 +26,11 @@ class ContactRegister
          */
 
         if ($request->subdomain) { 
-            /** @wip */
+            $company = Company::where('subdomain', $request->subdomain)->firstOrFail();
+
+            abort_unless($company->getSetting('enable_client_registration'), 404);
+
+            return $next($request);
         }
 
         abort_unless($request->company_key, 404);