diff --git a/payroll/forms/component_forms.py b/payroll/forms/component_forms.py
index 2cba46b97..01e1f41af 100644
--- a/payroll/forms/component_forms.py
+++ b/payroll/forms/component_forms.py
@@ -42,7 +42,7 @@ from payroll.widgets import component_widgets as widget
 logger = logging.getLogger(__name__)
 
 
-class AllowanceForm(forms.ModelForm):
+class AllowanceForm(ModelForm):
     """
     Form for Allowance model
     """
@@ -182,7 +182,7 @@ class AllowanceForm(forms.ModelForm):
         return multiple_conditions
 
 
-class DeductionForm(forms.ModelForm):
+class DeductionForm(ModelForm):
     """
     Form for Deduction model
     """
diff --git a/payroll/models/models.py b/payroll/models/models.py
index 83e4f322d..560ef5f46 100644
--- a/payroll/models/models.py
+++ b/payroll/models/models.py
@@ -1043,6 +1043,10 @@ class Allowance(HorillaModel):
         return str(self.title)
 
     def save(self):
+        request = getattr(horilla_middlewares._thread_locals, "request", None)
+        selected_company = request.session.get("selected_company")
+        if not self.id and selected_company and selected_company != "all":
+            self.company_id = Company.find(selected_company)
         super().save()
 
 
@@ -1325,6 +1329,10 @@ class Deduction(HorillaModel):
         return str(self.title)
 
     def save(self):
+        request = getattr(horilla_middlewares._thread_locals, "request", None)
+        selected_company = request.session.get("selected_company")
+        if not self.id and selected_company and selected_company != "all":
+            self.company_id = Company.find(selected_company)
         super().save()