diff --git a/app/Models/Traits/GeneratesNumbers.php b/app/Models/Traits/GeneratesNumbers.php
index d7b4a410df61..ab75e36d4405 100644
--- a/app/Models/Traits/GeneratesNumbers.php
+++ b/app/Models/Traits/GeneratesNumbers.php
@@ -128,8 +128,9 @@ trait GeneratesNumbers
         $replace[] = str_pad($counter, $this->invoice_number_padding, '0', STR_PAD_LEFT);
 
         if (strstr($pattern, '{$userId}')) {
+            $userId = $entity->user ? $entity->user->public_id : (Auth::check() ? Auth::user()->public_id : 0);
             $search[] = '{$userId}';
-            $replace[] = str_pad(($entity->user->public_id + 1), 2, '0', STR_PAD_LEFT);
+            $replace[] = str_pad(($userId + 1), 2, '0', STR_PAD_LEFT);
         }
 
         $matches = false;
diff --git a/resources/views/accounts/invoice_settings.blade.php b/resources/views/accounts/invoice_settings.blade.php
index 3c7edac2518b..67a51feb1bdc 100644
--- a/resources/views/accounts/invoice_settings.blade.php
+++ b/resources/views/accounts/invoice_settings.blade.php
@@ -107,39 +107,37 @@
                 </div>
                 <div role="tabpanel" class="tab-pane" id="client_number">
                     <div class="panel-body">
-                        @if ( ! $account->client_number_counter)
-                            {!! Former::checkbox('client_number_enabled')
-                                    ->label('client_number')
-                                    ->onchange('onClientNumberChange()')
-                                    ->text('enable')!!}
-                            <div id="clientNumberDiv" style="display:none">
-                        @endif
+                        {!! Former::checkbox('client_number_enabled')
+                                ->label('client_number')
+                                ->onchange('onClientNumberEnabled()')
+                                ->text('enable')
+                                ->check($account->client_number_counter > 0) !!}
 
-                        {!! Former::inline_radios('client_number_type')
-                                ->onchange('onClientNumberTypeChange()')
-                                ->label(trans('texts.type'))
-                                ->radios([
-                                    trans('texts.prefix') => ['value' => 'prefix', 'name' => 'client_number_type'],
-                                    trans('texts.pattern') => ['value' => 'pattern', 'name' => 'client_number_type'],
-                                ])->check($account->client_number_pattern ? 'pattern' : 'prefix') !!}
+                        <div id="clientNumberDiv" style="display:none">
 
-                        {!! Former::text('client_number_prefix')
-                                ->addGroupClass('client-prefix')
-                                ->label(trans('texts.prefix')) !!}
-                        {!! Former::text('client_number_pattern')
-                                ->appendIcon('question-sign')
-                                ->addGroupClass('client-pattern')
-                                ->addGroupClass('number-pattern')
-                                ->label(trans('texts.pattern')) !!}
-                        {!! Former::text('client_number_counter')
-                                ->label(trans('texts.counter'))
-                                ->addGroupClass('pad-checkbox')
-                                ->help(trans('texts.client_number_help') . ' ' .
-                                    trans('texts.next_client_number', ['number' => $account->getNextNumber()])) !!}
+                            {!! Former::inline_radios('client_number_type')
+                                    ->onchange('onClientNumberTypeChange()')
+                                    ->label(trans('texts.type'))
+                                    ->radios([
+                                        trans('texts.prefix') => ['value' => 'prefix', 'name' => 'client_number_type'],
+                                        trans('texts.pattern') => ['value' => 'pattern', 'name' => 'client_number_type'],
+                                    ])->check($account->client_number_pattern ? 'pattern' : 'prefix') !!}
 
-                        @if ( ! $account->client_number_counter)
-                            </div>
-                        @endif
+                            {!! Former::text('client_number_prefix')
+                                    ->addGroupClass('client-prefix')
+                                    ->label(trans('texts.prefix')) !!}
+                            {!! Former::text('client_number_pattern')
+                                    ->appendIcon('question-sign')
+                                    ->addGroupClass('client-pattern')
+                                    ->addGroupClass('number-pattern')
+                                    ->label(trans('texts.pattern')) !!}
+                            {!! Former::text('client_number_counter')
+                                    ->label(trans('texts.counter'))
+                                    ->addGroupClass('pad-checkbox')
+                                    ->help(trans('texts.client_number_help') . ' ' .
+                                        trans('texts.next_client_number', ['number' => $account->getNextNumber()])) !!}
+
+                        </div>
                     </div>
                 </div>
                 <div role="tabpanel" class="tab-pane" id="recurring_invoice_number">
@@ -390,11 +388,11 @@
         }
     }
 
-    function onClientNumberChange() {
+    function onClientNumberEnabled() {
         var enabled = $('#client_number_enabled').is(':checked');
         if (enabled) {
             $('#clientNumberDiv').show();
-            $('#client_number_counter').val(1);
+            $('#client_number_counter').val({{ $account->client_number_counter ?: 1 }});
         } else {
             $('#clientNumberDiv').hide();
             $('#client_number_counter').val(0);
@@ -410,6 +408,7 @@
         onInvoiceNumberTypeChange();
         onQuoteNumberTypeChange();
         onClientNumberTypeChange();
+        onClientNumberEnabled();
     });
 
 	</script>