diff --git a/app/Factory/ClientFactory.php b/app/Factory/ClientFactory.php
index 506e5b3ac43f..35b600618c87 100644
--- a/app/Factory/ClientFactory.php
+++ b/app/Factory/ClientFactory.php
@@ -28,7 +28,7 @@ class ClientFactory
         $client->public_notes = '';
         $client->balance = 0;
         $client->paid_to_date = 0;
-        // $client->country_id = 4;
+        $client->country_id = 840;
         $client->is_deleted = 0;
         $client->client_hash = Str::random(40);
         $client->settings = ClientSettings::defaults();
diff --git a/app/Http/Livewire/RequiredClientInfo.php b/app/Http/Livewire/RequiredClientInfo.php
index 44f9eb84d4eb..35372358efc1 100644
--- a/app/Http/Livewire/RequiredClientInfo.php
+++ b/app/Http/Livewire/RequiredClientInfo.php
@@ -141,7 +141,7 @@ class RequiredClientInfo extends Component
             $_field = $this->mappings[$field['name']];
 
             if (Str::startsWith($field['name'], 'client_')) {
-                if (empty($this->contact->client->{$_field}) || is_null($this->contact->client->{$_field})) {
+                if (empty($this->contact->client->{$_field}) || is_null($this->contact->client->{$_field}) || $this->contact->client->{$_field} = 840) {
                     $this->show_form = true;
                 } else {
                     $this->fields[$index]['filled'] = true;
@@ -149,7 +149,7 @@ class RequiredClientInfo extends Component
             }
 
             if (Str::startsWith($field['name'], 'contact_')) {
-                if ((empty($this->contact->{$_field}) || is_null($this->contact->{$_field}))) {
+                if ((empty($this->contact->{$_field}) || is_null($this->contact->{$_field})) || $this->contact->client->{$_field} = 840) {
                     $this->show_form = true;
                 } else {
                     $this->fields[$index]['filled'] = true;