diff --git a/app/Http/Requests/Expense/StoreExpenseRequest.php b/app/Http/Requests/Expense/StoreExpenseRequest.php
index 398fdf582fb1..f1e7482f5454 100644
--- a/app/Http/Requests/Expense/StoreExpenseRequest.php
+++ b/app/Http/Requests/Expense/StoreExpenseRequest.php
@@ -39,7 +39,8 @@ class StoreExpenseRequest extends Request
     {
         $rules = [];
 
-        $rules['number'] = 'unique:expenses,number,'.$this->id.',id,company_id,'.auth()->user()->company()->id;
+        $rules['number'] = Rule::unique('expenses')->where('company_id', auth()->user()->company()->id);
+        // $rules['number'] = 'unique:expenses,number,'.$this->id.',id,company_id,'.auth()->user()->company()->id;
         $rules['contacts.*.email'] = 'nullable|distinct';
         //$rules['number'] = new UniqueExpenseNumberRule($this->all());
         $rules['client_id'] = 'bail|sometimes|exists:clients,id,company_id,'.auth()->user()->company()->id;
diff --git a/app/Http/Requests/Expense/UpdateExpenseRequest.php b/app/Http/Requests/Expense/UpdateExpenseRequest.php
index bdda97a3eb09..bbaddc7ad89a 100644
--- a/app/Http/Requests/Expense/UpdateExpenseRequest.php
+++ b/app/Http/Requests/Expense/UpdateExpenseRequest.php
@@ -42,9 +42,8 @@ class UpdateExpenseRequest extends Request
         //$rules['id_number'] = 'unique:clients,id_number,,id,company_id,' . auth()->user()->company()->id;
         $rules['contacts.*.email'] = 'nullable|distinct';
 
-        if ($this->input('number')) {
-            $rules['number'] = 'unique:expenses,number,'.$this->id.',id,company_id,'.$this->expense->company_id;
-        }
+        if(isset($this->number))
+            $rules['number'] = Rule::unique('expenses')->where('company_id', auth()->user()->company()->id)->ignore($this->expense->id);
 
         return $this->globalRules($rules);
     }
diff --git a/app/Http/Requests/Project/UpdateProjectRequest.php b/app/Http/Requests/Project/UpdateProjectRequest.php
index 3e7f06eb7278..48c4e947a140 100644
--- a/app/Http/Requests/Project/UpdateProjectRequest.php
+++ b/app/Http/Requests/Project/UpdateProjectRequest.php
@@ -33,9 +33,8 @@ class UpdateProjectRequest extends Request
     {
         $rules = [];
         
-        if ($this->input('number')) {
-            $rules['number'] = 'unique:projects,number,'.$this->id.',id,company_id,'.$this->project->company_id;
-        }
+        if(isset($this->number))
+            $rules['number'] = Rule::unique('projects')->where('company_id', auth()->user()->company()->id)->ignore($this->project->id);
 
         return $this->globalRules($rules);
     }
@@ -44,6 +43,9 @@ class UpdateProjectRequest extends Request
     {
         $input = $this->decodePrimaryKeys($this->all()); 
 
+        if(isset($input['client_id']))
+            unset($input['client_id']);
+
         $this->replace($input);
     }
 }
diff --git a/app/Jobs/Account/CreateAccount.php b/app/Jobs/Account/CreateAccount.php
index 1f69e0e60ebd..98959d5b13fd 100644
--- a/app/Jobs/Account/CreateAccount.php
+++ b/app/Jobs/Account/CreateAccount.php
@@ -18,6 +18,7 @@ use App\Jobs\Company\CreateCompanyPaymentTerms;
 use App\Jobs\Company\CreateCompanyTaskStatuses;
 use App\Jobs\Company\CreateCompanyToken;
 use App\Jobs\User\CreateUser;
+use App\Jobs\Util\VersionCheck;
 use App\Models\Account;
 use App\Models\User;
 use App\Notifications\Ninja\NewAccountCreated;
@@ -93,6 +94,8 @@ class CreateAccount
 
         $sp035a66->notification(new NewAccountCreated($spaa9f78, $sp035a66))->ninja();
 
+        VersionCheck::dispatchNow();
+
         LightLogs::create(new AnalyticsAccountCreated())
                  ->increment()
                  ->batch();