diff --git a/app/Http/Controllers/Common/Companies.php b/app/Http/Controllers/Common/Companies.php
index 1c8efba9e..95892f98a 100644
--- a/app/Http/Controllers/Common/Companies.php
+++ b/app/Http/Controllers/Common/Companies.php
@@ -8,6 +8,7 @@ use App\Http\Requests\Common\Company as Request;
 use App\Models\Common\Company;
 use App\Models\Setting\Currency;
 use App\Traits\Uploads;
+use App\Utilities\Overrider;
 
 class Companies extends Controller
 {
@@ -60,6 +61,8 @@ class Companies extends Controller
      */
     public function store(Request $request)
     {
+        $company_id = session('company_id');
+
         setting()->forgetAll();
 
         // Create company
@@ -86,6 +89,12 @@ class Companies extends Controller
         setting()->setExtraColumns(['company_id' => $company->id]);
         setting()->save();
 
+        setting()->forgetAll();
+
+        session(['company_id' => $company_id]);
+
+        Overrider::load('settings');
+
         // Redirect
         $message = trans('messages.success.added', ['type' => trans_choice('general.companies', 1)]);
 
@@ -129,6 +138,8 @@ class Companies extends Controller
      */
     public function update(Company $company, Request $request)
     {
+        $company_id = session('company_id');
+
         // Check if user can update company
         if (!$this->isUserCompany($company)) {
             $message = trans('companies.error.not_user_company');
@@ -166,6 +177,12 @@ class Companies extends Controller
 
         setting()->save();
 
+        setting()->forgetAll();
+
+        session(['company_id' => $company_id]);
+
+        Overrider::load('settings');
+
         // Redirect
         $message = trans('messages.success.updated', ['type' => trans_choice('general.companies', 1)]);
 
@@ -191,6 +208,7 @@ class Companies extends Controller
         flash($message)->success();
 
         return redirect()->route('companies.index');
+
     }
 
     /**
diff --git a/resources/views/common/companies/create.blade.php b/resources/views/common/companies/create.blade.php
index 498a68d9c..412c80099 100644
--- a/resources/views/common/companies/create.blade.php
+++ b/resources/views/common/companies/create.blade.php
@@ -46,6 +46,9 @@
         var text_no = '{{ trans('general.no') }}';
 
         $(document).ready(function(){
+            $('#enabled_1').trigger('click');
+            $('#company_name').focus();
+
             $("#default_currency").select2({
                 placeholder: "{{ trans('general.form.select.field', ['field' => trans_choice('general.currencies', 1)]) }}"
             });