diff --git a/app/Http/Controllers/CompanyUserController.php b/app/Http/Controllers/CompanyUserController.php
index c3d1c6ed45b1..69de122d5f4b 100644
--- a/app/Http/Controllers/CompanyUserController.php
+++ b/app/Http/Controllers/CompanyUserController.php
@@ -115,7 +115,7 @@ class CompanyUserController extends BaseController
         $auth_user = auth()->user();
         $company = $auth_user->company();
 
-        $company_user = CompanyUser::whereUserId($user->id)->whereCompanyId($company->id)->first();
+        $company_user = CompanyUser::query()->where('user_id', $user->id)->where('company_id',$company->id)->first();
 
         if (! $company_user) {
             throw new ModelNotFoundException(ctrans('texts.company_user_not_found'));
@@ -128,6 +128,11 @@ class CompanyUserController extends BaseController
         } else {
             $company_user->settings = $request->input('company_user')['settings'];
             $company_user->notifications = $request->input('company_user')['notifications'];
+
+            if(isset($request->input('company_user')['react_settings'])) {
+                $company_user->react_settings = $request->input('company_user')['react_settings'];
+            }
+
         }
 
         $company_user->save();
diff --git a/app/Http/Controllers/ImportController.php b/app/Http/Controllers/ImportController.php
index f6ae18029457..c2c0bee3329b 100644
--- a/app/Http/Controllers/ImportController.php
+++ b/app/Http/Controllers/ImportController.php
@@ -120,36 +120,49 @@ class ImportController extends Controller
 
 
         foreach($headers as $key => $value) {
-
-            $hit = false;
-            $unsetKey = false;
-            // array_multisort(array_column($translated_keys, 'label'), SORT_ASC, $translated_keys);
             
             foreach($translated_keys as $tkey => $tvalue)
             {
                 
                 if($this->testMatch($value, $tvalue['label'])) {
-                    $hit = $available_keys[$tvalue['key']];
-                    $unsetKey = $tkey;
+                    $hit = $tvalue['key'];
+                    $hints[$key] = $hit;
+                    unset($translated_keys[$tkey]);
+                    break;
+                }
+                else {
+                    $hints[$key] = null;
                 }
-                // elseif($this->testMatch($value, $tvalue['index'])) {
-                //     $hit = $available_keys[$tvalue['key']];
-                //     $unsetKey = $tkey;
-                // }
              
             }
 
-            if($hit) {
-                $hints[$key] = $hit;
-                unset($translated_keys[$unsetKey]);
-            } else {
-                $hints[$key] = null;
-            }
-
            
         }
 
-        nlog($translated_keys);
+        //second pass using the index of the translation here
+        foreach($headers as $key => $value)
+        {
+            if(isset($hints[$key])) {
+                nlog($hints[$key]);
+                continue;
+            }
+
+            foreach($translated_keys as $tkey => $tvalue) 
+            {
+                if($this->testMatch($value, $tvalue['index'])) {
+                    $hit = $tvalue['key'];
+                    $hints[$key] = $hit;
+                    unset($translated_keys[$tkey]);
+                    break;
+                } else {
+                    $hints[$key] = null;
+                }
+            }
+            
+        }
+
+
+//        nlog($translated_keys);
 
         return $hints;
     }
diff --git a/app/Http/Requests/CompanyUser/UpdateCompanyUserRequest.php b/app/Http/Requests/CompanyUser/UpdateCompanyUserRequest.php
index 8db3228d423a..380d063ea347 100644
--- a/app/Http/Requests/CompanyUser/UpdateCompanyUserRequest.php
+++ b/app/Http/Requests/CompanyUser/UpdateCompanyUserRequest.php
@@ -25,7 +25,10 @@ class UpdateCompanyUserRequest extends Request
      */
     public function authorize() : bool
     {
-        return auth()->user()->isAdmin() || (auth()->user()->id == $this->user->id);
+        /** @var \App\Models\User $auth_user */
+        $auth_user = auth()->user();
+
+        return $auth_user->isAdmin() || ($auth_user->id == $this->user->id);
     }
 
     public function rules()