diff --git a/app/DataMapper/ClientSettings.php b/app/DataMapper/ClientSettings.php
index 3e9fa589443f..133220a0d3dd 100644
--- a/app/DataMapper/ClientSettings.php
+++ b/app/DataMapper/ClientSettings.php
@@ -84,6 +84,8 @@ class ClientSettings extends BaseSettings
 	public static function buildClientSettings($company_settings, $client_settings) 
 	{
 
+		if(!$client_settings)
+			return $company_settings;
 		
 		foreach($company_settings as $key => $value)
 		{
diff --git a/app/Http/Requests/Company/UpdateCompanyRequest.php b/app/Http/Requests/Company/UpdateCompanyRequest.php
index b31ff9696eda..730898da649a 100644
--- a/app/Http/Requests/Company/UpdateCompanyRequest.php
+++ b/app/Http/Requests/Company/UpdateCompanyRequest.php
@@ -34,7 +34,7 @@ class UpdateCompanyRequest extends Request
 
     public function rules()
     {
-
+        
         $rules = [];
 
         $rules['company_logo'] = 'mimes:jpeg,jpg,png,gif|max:10000'; // max 10000kb
diff --git a/app/Repositories/CompanyRepository.php b/app/Repositories/CompanyRepository.php
index 3d1759ce93bc..b44c9821badd 100644
--- a/app/Repositories/CompanyRepository.php
+++ b/app/Repositories/CompanyRepository.php
@@ -48,6 +48,9 @@ class CompanyRepository extends BaseRepository
     public function save(array $data, Company $company) : ?Company
 	{
 
+       if(isset($data['custom_fields']))
+           $data['custom_fields'] = $this->parseCustomFields($data['custom_fields']);
+
         $company->fill($data);
 
         $company->save();
@@ -56,4 +59,14 @@ class CompanyRepository extends BaseRepository
         
 	}
 
+    private function parseCustomFields($fields) :array
+    {
+        foreach($fields as &$value)
+        {
+             $value = (string)$value;
+        }
+
+        return $fields;
+    }
+
 }
\ No newline at end of file
diff --git a/app/Transformers/CompanyUserTransformer.php b/app/Transformers/CompanyUserTransformer.php
index 7f34a1a0176f..cf96c490d8ad 100644
--- a/app/Transformers/CompanyUserTransformer.php
+++ b/app/Transformers/CompanyUserTransformer.php
@@ -46,10 +46,10 @@ class CompanyUserTransformer extends EntityTransformer
     public function transform(CompanyUser $company_user)
     {
         return [
-            'id' => $company_user->id,
-            'account_id' => $company_user->account_id,
-            'user_id' => $company_user->user_id,
-            'company_id' => $company_user->company_id,
+            // 'id' => $company_user->id,
+            // 'account_id' => $company_user->account_id,
+            // 'user_id' => $company_user->user_id,
+            // 'company_id' => $company_user->company_id,
             'permissions' => $company_user->permissions ?: '',
             'settings' => $company_user->settings ?: '',
             'is_owner' => (bool) $company_user->is_owner,