diff --git a/app/Ninja/Repositories/ClientRepository.php b/app/Ninja/Repositories/ClientRepository.php
index 70db2b3945aa..e30a458735cb 100644
--- a/app/Ninja/Repositories/ClientRepository.php
+++ b/app/Ninja/Repositories/ClientRepository.php
@@ -81,13 +81,15 @@ class ClientRepository extends BaseRepository
             // do nothing
         } elseif (! $publicId || $publicId == '-1') {
             $client = Client::createNew();
-            if (Auth::check() && Auth::user()->account->client_number_counter && empty($data['id_number'])) {
-                $data['id_number'] = Auth::user()->account->getNextNumber();
-            }
         } else {
             $client = Client::scope($publicId)->with('contacts')->firstOrFail();
         }
 
+        // auto-set the client id number
+        if (Auth::check() && Auth::user()->account->client_number_counter && !$client->id_number && empty($data['id_number'])) {
+            $data['id_number'] = Auth::user()->account->getNextNumber();
+        }
+
         if ($client->is_deleted) {
             return $client;
         }