diff --git a/app/Http/Controllers/SelfUpdateController.php b/app/Http/Controllers/SelfUpdateController.php
index 4614d1486cea..aa313d712af1 100644
--- a/app/Http/Controllers/SelfUpdateController.php
+++ b/app/Http/Controllers/SelfUpdateController.php
@@ -102,7 +102,7 @@ class SelfUpdateController extends BaseController
         nlog('Extracting zip');
 
         //clean up old snappdf installations
-        $this->cleanOldSnapChromeBinaries();
+        //$this->cleanOldSnapChromeBinaries();
 
         $zipFile = new \PhpZip\ZipFile();
 
diff --git a/app/Models/ClientContact.php b/app/Models/ClientContact.php
index 891270640892..d6984ad7970f 100644
--- a/app/Models/ClientContact.php
+++ b/app/Models/ClientContact.php
@@ -17,6 +17,7 @@ use App\Jobs\Mail\NinjaMailerObject;
 use App\Mail\ClientContact\ClientContactResetPasswordObject;
 use App\Models\Presenters\ClientContactPresenter;
 use App\Notifications\ClientContactResetPassword;
+use App\Utils\Ninja;
 use App\Utils\Traits\MakesHash;
 use Illuminate\Contracts\Translation\HasLocalePreference;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
@@ -257,8 +258,33 @@ class ClientContact extends Authenticatable implements HasLocalePreference
      */
     public function getLoginLink()
     {
-        $domain = isset($this->company->portal_domain) ? $this->company->portal_domain : $this->company->domain();
+        // $domain = isset($this->company->portal_domain) ? $this->company->portal_domain : $this->company->domain();
+
+        // return $domain.'/client/key_login/'.$this->contact_key;
+
+        if (Ninja::isHosted()) {
+            $domain = $this->company->domain();
+        } else {
+            $domain = config('ninja.app_url');
+        }
+
+        switch ($this->company->portal_mode) {
+            case 'subdomain':
+                return $domain.'/client/key_login/'.$this->contact_key;
+                break;
+            case 'iframe':
+                return $domain.'/client/key_login/'.$this->contact_key;
+                //return $domain . $entity_type .'/'. $this->contact->client->client_hash .'/'. $this->key;
+                break;
+            case 'domain':
+                return $domain.'/client/key_login/'.$this->contact_key;
+                break;
+
+            default:
+                return '';
+                break;
+        }
+
 
-        return $domain.'/client/key_login/'.$this->contact_key;
     }
 }