diff --git a/app/Factory/CompanyFactory.php b/app/Factory/CompanyFactory.php
index 6eb846084dc7..a7c8a5d2acec 100644
--- a/app/Factory/CompanyFactory.php
+++ b/app/Factory/CompanyFactory.php
@@ -35,7 +35,7 @@ class CompanyFactory
         $company->custom_fields = (object) [];
         $company->subdomain = '';
         $company->enabled_modules = config('ninja.enabled_modules'); //32767;//8191; //4095
-        $company->default_password_timeout = 30;
+        $company->default_password_timeout = 1800000;
 
         return $company;
     }
diff --git a/app/Http/Requests/Client/StoreClientRequest.php b/app/Http/Requests/Client/StoreClientRequest.php
index b9cb4f1a15d6..59c06f72f720 100644
--- a/app/Http/Requests/Client/StoreClientRequest.php
+++ b/app/Http/Requests/Client/StoreClientRequest.php
@@ -46,6 +46,10 @@ class StoreClientRequest extends Request
             $rules['documents'] = 'file|mimes:png,ai,svg,jpeg,tiff,pdf,gif,psd,txt,doc,xls,ppt,xlsx,docx,pptx|max:20000';
         }
 
+        if (isset($this->number)) {
+            $rules['number'] = Rule::unique('clients')->where('company_id', auth()->user()->company()->id);
+        }
+
         /* Ensure we have a client name, and that all emails are unique*/
         //$rules['name'] = 'required|min:1';
         $rules['id_number'] = 'unique:clients,id_number,'.$this->id.',id,company_id,'.$this->company_id;
diff --git a/config/app.php b/config/app.php
index c1dd0812a8ef..b5a5b1bbabe7 100644
--- a/config/app.php
+++ b/config/app.php
@@ -53,7 +53,7 @@ return [
     */
 
     'url' => env('APP_URL', 'http://localhost'),
-
+    'mix_url' => env('APP_URL', 'http://localhost'),
     /*
     |--------------------------------------------------------------------------
     | Application Timezone