diff --git a/app/Jobs/Util/Import.php b/app/Jobs/Util/Import.php
index d35e571775c7..f7ec841a1e6e 100644
--- a/app/Jobs/Util/Import.php
+++ b/app/Jobs/Util/Import.php
@@ -237,9 +237,12 @@ class Import implements ShouldQueue
         //company size check
         if ($this->company->invoices()->count() > 500 || $this->company->products()->count() > 500 || $this->company->clients()->count() > 500) {
             $this->company->is_large = true;
-            $this->company->save();
         }
 
+
+        $this->company->client_registration_fields = \App\DataMapper\ClientRegistrationFields::generate();
+        $this->company->save();
+
         $this->setInitialCompanyLedgerBalances();
         
         // $this->fixClientBalances();
diff --git a/app/Observers/QuoteObserver.php b/app/Observers/QuoteObserver.php
index 89c64a603e2b..6e32b7f4e234 100644
--- a/app/Observers/QuoteObserver.php
+++ b/app/Observers/QuoteObserver.php
@@ -30,9 +30,9 @@ class QuoteObserver
                         ->where('event_id', Webhook::EVENT_CREATE_QUOTE)
                         ->exists();
 
-        $quote->load('client');
 
         if ($subscriptions) {
+            $quote->load('client');
             WebhookHandler::dispatch(Webhook::EVENT_CREATE_QUOTE, $quote, $quote->company);
         }
     }
@@ -49,10 +49,10 @@ class QuoteObserver
                         ->where('event_id', Webhook::EVENT_UPDATE_QUOTE)
                         ->exists();
 
-        $quote->load('client');
 
 
         if ($subscriptions) {
+            $quote->load('client');
             WebhookHandler::dispatch(Webhook::EVENT_UPDATE_QUOTE, $quote, $quote->company);
         }
 
@@ -71,6 +71,7 @@ class QuoteObserver
                         ->exists();
 
         if ($subscriptions) {
+            $quote->load('client');
             WebhookHandler::dispatch(Webhook::EVENT_DELETE_QUOTE, $quote, $quote->company);
         }
     }
diff --git a/app/Transformers/CompanyTransformer.php b/app/Transformers/CompanyTransformer.php
index 971f2635b947..9fcd7abf44f9 100644
--- a/app/Transformers/CompanyTransformer.php
+++ b/app/Transformers/CompanyTransformer.php
@@ -165,6 +165,7 @@ class CompanyTransformer extends EntityTransformer
             'markdown_enabled' => (bool) $company->markdown_enabled,
             'use_comma_as_decimal_place' => (bool) $company->use_comma_as_decimal_place,
             'report_include_drafts' => (bool) $company->report_include_drafts,
+            'client_registration_fields' => (array) $company->client_registration_fields,
         ];
     }
 
diff --git a/resources/views/portal/ninja2020/auth/register.blade.php b/resources/views/portal/ninja2020/auth/register.blade.php
index 7512c555a8fa..5bb5513b42d1 100644
--- a/resources/views/portal/ninja2020/auth/register.blade.php
+++ b/resources/views/portal/ninja2020/auth/register.blade.php
@@ -14,6 +14,7 @@
                 @csrf
 
                 <div class="grid grid-cols-12 gap-4 mt-10">
+                    @if($company->client_registration_fields)
                     @foreach($company->client_registration_fields as $field)
                         @if($field['required'])
                             <div class="col-span-12 md:col-span-6">
@@ -96,6 +97,7 @@
                             @endif
                         @endif
                     @endforeach
+                    @endif
                 </div>
 
                 <div class="flex justify-between items-center mt-8">