diff --git a/app/Console/Commands/CreateTestData.php b/app/Console/Commands/CreateTestData.php
index 7ee74296c3f3..608ed3d285c9 100644
--- a/app/Console/Commands/CreateTestData.php
+++ b/app/Console/Commands/CreateTestData.php
@@ -201,7 +201,7 @@ class CreateTestData extends Command
             'is_admin' => 1,
             'is_locked' => 0,
             'permissions' => '',
-            'settings' => new \stdClass,
+            'settings' => null,
         ]);
 
 
@@ -300,7 +300,7 @@ class CreateTestData extends Command
             'is_admin' => 1,
             'is_locked' => 0,
             'permissions' => '',
-            'settings' => new \stdClass,
+            'settings' => null,
         ]);
 
 
diff --git a/app/Http/Controllers/CompanyController.php b/app/Http/Controllers/CompanyController.php
index 7276811352de..6c8522b69248 100644
--- a/app/Http/Controllers/CompanyController.php
+++ b/app/Http/Controllers/CompanyController.php
@@ -214,6 +214,7 @@ class CompanyController extends BaseController
             'is_admin' => 1,
             'is_locked' => 0,
             'permissions' => '',
+            'settings' => null,
             //'settings' => DefaultSettings::userSettings(),
         ]);
 
diff --git a/app/Http/Requests/Client/StoreClientRequest.php b/app/Http/Requests/Client/StoreClientRequest.php
index 417f9655070e..2c7039af14bf 100644
--- a/app/Http/Requests/Client/StoreClientRequest.php
+++ b/app/Http/Requests/Client/StoreClientRequest.php
@@ -81,22 +81,22 @@ class StoreClientRequest extends Request
             $input['group_settings_id'] = $this->decodePrimaryKey($input['group_settings_id']);
         }
 
-        if(empty($input['settings']) || empty($input['settings']->currency_id))
-        {
-            if(empty($input['group_settings_id']))
-            {
-                $input['settings']->currency_id = auth()->user()->company()->settings->currency_id;
-            }
-            else
-            {
-                $group_settings = GroupSetting::find($input['group_settings_id']);
+        // if(empty($input['settings']) || empty($input['settings']->currency_id))
+        // {
+        //     if(empty($input['group_settings_id']))
+        //     {
+        //         $input['settings']->currency_id = auth()->user()->company()->settings->currency_id;
+        //     }
+        //     else
+        //     {
+        //         $group_settings = GroupSetting::find($input['group_settings_id']);
 
-                if($group_settings && property_exists($group_settings, 'currency_id') && is_int($group_settings->currency_id))
-                    $input['settings']->currency_id = $group_settings->currency_id;
-                else
-                  $input['settings']->currency_id = auth()->user()->company()->settings->currency_id;
-            }
-        }
+        //         if($group_settings && property_exists($group_settings, 'currency_id') && is_int($group_settings->currency_id))
+        //             $input['settings']->currency_id = $group_settings->currency_id;
+        //         else
+        //           $input['settings']->currency_id = auth()->user()->company()->settings->currency_id;
+        //     }
+        // }
 
         if(isset($input['contacts']))
         {