diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php
index a6a03cad6414..49ab2a4786d2 100644
--- a/app/Http/Kernel.php
+++ b/app/Http/Kernel.php
@@ -53,7 +53,6 @@ class Kernel extends HttpKernel
             'throttle:60,1',
             'bindings',
             'query_logging',
-            'cors',
             \App\Http\Middleware\StartupCheck::class,
         ],
         'contact' => [
diff --git a/app/Http/Requests/Client/StoreClientRequest.php b/app/Http/Requests/Client/StoreClientRequest.php
index 4986baeff7bb..0837825cdfad 100644
--- a/app/Http/Requests/Client/StoreClientRequest.php
+++ b/app/Http/Requests/Client/StoreClientRequest.php
@@ -17,6 +17,7 @@ use App\Http\ValidationRules\ValidSettingsRule;
 use App\Models\Client;
 use App\Utils\Traits\MakesHash;
 use Illuminate\Support\Facades\Log;
+use Illuminate\Validation\Rule;
 
 class StoreClientRequest extends Request
 {
@@ -43,15 +44,18 @@ class StoreClientRequest extends Request
         //$rules['name'] = 'required|min:1';
         $rules['id_number'] = 'unique:clients,id_number,' . $this->id . ',id,company_id,' . $this->company_id;
         $rules['settings'] = new ValidSettingsRule();
-        
+
         $contacts = request('contacts');
 
         if(is_array($contacts))
         {
 
             for ($i = 0; $i < count($contacts); $i++) {
-                //$rules['contacts.' . $i . '.email'] = 'required|email|unique:client_contacts,email,' . isset($contacts[$i]['id']);
-                $rules['contacts.' . $i . '.email'] = 'nullable|email';
+                // $rules['contacts.' . $i . '.email'] = Rule::unique('client_contacts','email')->where(function ($query) {
+                //                                     return $query->where('company_id', $this->company_id);
+                //                                 });
+                    //$rules['contacts.' . $i . '.email'] = 'nullable|email|unique:client_contacts,email,NULL,' . isset($contacts[$i]['id']).',company_id,'.$this->company_id;
+                $rules['contacts.' . $i . '.email'] = 'nullable|email|unique:client_contacts,email,client_id,'.$this->id;
             }
 
         }
diff --git a/app/Http/Requests/Client/UpdateClientRequest.php b/app/Http/Requests/Client/UpdateClientRequest.php
index ae08539fd626..8190c9ffc469 100644
--- a/app/Http/Requests/Client/UpdateClientRequest.php
+++ b/app/Http/Requests/Client/UpdateClientRequest.php
@@ -54,8 +54,8 @@ class UpdateClientRequest extends Request
             if(is_array($contacts))
             {
                 for ($i = 0; $i < count($contacts); $i++) {
-                    //$rules['contacts.' . $i . '.email'] = 'nullable|email|unique:client_contacts,email,' . $contacts[$i]['id'];
-                    $rules['contacts.' . $i . '.email'] = 'nullable|email';
+                    $rules['contacts.' . $i . '.email'] = 'nullable|email|unique:client_contacts,email,' . isset($contacts[$i]['id'].',company_id,'.$this->company_id);
+                    //$rules['contacts.' . $i . '.email'] = 'nullable|email';
                 }
             }
             return $rules;
diff --git a/app/Jobs/Company/CreateCompany.php b/app/Jobs/Company/CreateCompany.php
index 055ab58bf6be..d6e17430a57d 100644
--- a/app/Jobs/Company/CreateCompany.php
+++ b/app/Jobs/Company/CreateCompany.php
@@ -51,7 +51,7 @@ class CreateCompany
     {
         $settings = CompanySettings::defaults();
 
-        $default_company_name = isset($this->request['first_name']) ?: '' . ' ' . isset($this->request['last_name']) ?: '';
+        $default_company_name = isset($this->request['first_name']) ? $this->request['first_name'] : '' . ' ' . isset($this->request['last_name']) ? $this->request['last_name'] : '';
 
         $settings->name = isset($this->request['name']) ? $this->request['name'] :  $default_company_name;
 
diff --git a/routes/api.php b/routes/api.php
index bccbdc7d62e3..1c305e49567e 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -25,14 +25,14 @@ Route::group(['middleware' => ['api_secret_check']], function () {
 
 });
 
-Route::group(['api_secret_check','domain_db','cors'], function () {
+Route::group(['api_secret_check','domain_db'], function () {
 
   Route::post('api/v1/login', 'Auth\LoginController@apiLogin')->name('login.submit');
   Route::post('api/v1/reset_password', 'Auth\ForgotPasswordController@sendResetLinkEmail')->name('password.reset');
 
 });
 
-Route::group(['middleware' => ['api_db','api_secret_check','token_auth','cors'], 'prefix' =>'api/v1', 'as' => 'api.'], function () {
+Route::group(['middleware' => ['api_db','api_secret_check','token_auth'], 'prefix' =>'api/v1', 'as' => 'api.'], function () {
 
   Route::resource('activities', 'ActivityController'); // name = (clients. index / create / show / update / destroy / edit