diff --git a/app/Utils/Traits/Inviteable.php b/app/Utils/Traits/Inviteable.php
index fef8239788a3..5ac92929683e 100644
--- a/app/Utils/Traits/Inviteable.php
+++ b/app/Utils/Traits/Inviteable.php
@@ -108,9 +108,9 @@ trait Inviteable
         switch ($this->company->portal_mode) {
             case 'subdomain':
 
-                if(Ninja::isHosted())
-                    return 'https://router.invoiceninja.com/route/'.encrypt($domain.'/client/'.$entity_type.'/'.$this->key);
-                else
+                // if(Ninja::isHosted())
+                //     return 'https://router.invoiceninja.com/route/'.encrypt($domain.'/client/'.$entity_type.'/'.$this->key);
+                // else
                     return $domain.'/client/'.$entity_type.'/'.$this->key;
                 break;
             case 'iframe':
diff --git a/resources/views/portal/ninja2020/components/livewire/subscription-plan-switch.blade.php b/resources/views/portal/ninja2020/components/livewire/subscription-plan-switch.blade.php
index c1be68fc7043..cdde495038cf 100644
--- a/resources/views/portal/ninja2020/components/livewire/subscription-plan-switch.blade.php
+++ b/resources/views/portal/ninja2020/components/livewire/subscription-plan-switch.blade.php
@@ -33,6 +33,9 @@
                 <input type="hidden" name="action" value="payment">
                 <input type="hidden" name="company_gateway_id" value="{{ $state['company_gateway_id'] }}"/>
                 <input type="hidden" name="payment_method_id" value="{{ $state['payment_method_id'] }}"/>
+                <input type="hidden" name="contact_first_name" value="{{ $contact->first_name }}">
+                <input type="hidden" name="contact_last_name" value="{{ $contact->last_name }}">
+                <input type="hidden" name="contact_email" value="{{ $contact->email }}">
             </form>
 
     <!-- Payment methods -->