diff --git a/app/Http/Controllers/Auth/ContactLoginController.php b/app/Http/Controllers/Auth/ContactLoginController.php
index 328fb8698b8f..fad924f812a6 100644
--- a/app/Http/Controllers/Auth/ContactLoginController.php
+++ b/app/Http/Controllers/Auth/ContactLoginController.php
@@ -96,7 +96,7 @@ class ContactLoginController extends Controller
             return $this->sendLockoutResponse($request);
         }
 
-        if(Ninja::isHosted() && $company = Company::where('company_key', $request->input('company_key'))->first()){
+        if(Ninja::isHosted() && $request->has('password') && $company = Company::where('company_key', $request->input('company_key'))->first()){
 
             $contact = ClientContact::where(['email' => $request->input('email'), 'company_id' => $company->id])->first();
 
@@ -132,7 +132,6 @@ class ContactLoginController extends Controller
 
     public function authenticated(Request $request, ClientContact $client)
     {
-        // Auth::guard('contact')->loginUsingId($client->id, true);
         auth()->guard('contact')->loginUsingId($client->id, true);
 
         event(new ContactLoggedIn($client, $client->company, Ninja::eventVars()));
diff --git a/app/Http/Middleware/ContactRegister.php b/app/Http/Middleware/ContactRegister.php
index 2b3a72e1653b..6c8922ff65ba 100644
--- a/app/Http/Middleware/ContactRegister.php
+++ b/app/Http/Middleware/ContactRegister.php
@@ -37,15 +37,14 @@ class ContactRegister
                 if(! $company->client_can_register)
                     abort(400, 'Registration disabled');
 
-               // $request->merge(['key' => $company->company_key]);
-                session()->put('key', $company->company_key);
+                    session()->put('key', $company->company_key);
 
                 return $next($request);
             }
 
         }
 
-       $query = [
+        $query = [
             'portal_domain' => $request->getSchemeAndHttpHost(),
             'portal_mode' => 'domain',
         ];
diff --git a/resources/views/portal/ninja2020/auth/register.blade.php b/resources/views/portal/ninja2020/auth/register.blade.php
index 8396864c1d94..a3fa0befc8ce 100644
--- a/resources/views/portal/ninja2020/auth/register.blade.php
+++ b/resources/views/portal/ninja2020/auth/register.blade.php
@@ -11,6 +11,10 @@
             <p class="block text-center text-gray-600">{{ ctrans('texts.register_label') }}</p>
 
             <form action="{{ route('client.register', request()->route('company_key')) }}" method="POST" x-data="{ more: false }">
+                @if($company)
+                <input type="hidden" name="company_key" value="{{ $company->company_key }}">
+                @endif
+
                 @csrf
 
                 <div class="grid grid-cols-12 gap-4 mt-10">