diff --git a/addons_extensions/employee_jod/models/emp_jod.py b/addons_extensions/employee_jod/models/emp_jod.py
index 7704ef07b..2612a96bc 100644
--- a/addons_extensions/employee_jod/models/emp_jod.py
+++ b/addons_extensions/employee_jod/models/emp_jod.py
@@ -16,19 +16,21 @@ class HREmployee(models.Model):
     def send_jod_form_to_employee(self):
         for rec in self:
             if not rec.applicant_id:
-                application = self.env['hr.applicant'].sudo().search([('employee_id', '=', rec.id)], limit=1)
+                application = self.env['hr.applicant'].sudo().search([('employee_id', '=', rec.id),'|',('company_id','=',False),('company_id','=',self.env.company.id)], limit=1)
                 if not application:
                     candidate = self.env['hr.candidate'].sudo().create({
                         'partner_name': rec.name,
                         'email_from': rec.work_email,
                         'partner_phone': rec.work_phone,
                         'employee_id': rec.id,
+                        'company_id': self.env.company.id
                     })
 
                     application = self.env['hr.applicant'].sudo().create({
                         'candidate_id': candidate.id,
                         'hr_job_recruitment': self.env.ref('employee_jod.employee_jod_internal_job_recruitment_id').id,
                         'recruitment_stage_id': self.env.ref('employee_jod.hired_stage8').id,
+                        'company_id': self.env.company.id
                     })
                 rec.applicant_id = application.id
             return rec.sudo().applicant_id.send_jod_form_to_employee()
@@ -43,7 +45,7 @@ class PostOnboardingAttachmentWizard(models.TransientModel):
     def _onchange_template_id(self):
         """ Update the email body and recipients based on the selected template. """
         if self.template_id:
-            record_id = self.env.context.get('applicant_id')
+            record_id = self.env.context.get('active_id')
             model = self.env.context.get('active_model')
             if model == 'applicant.request.forms':
                 applicant = self.env['hr.applicant'].browse(record_id)
diff --git a/addons_extensions/menu_control_center/security/ir.model.access.csv b/addons_extensions/menu_control_center/security/ir.model.access.csv
index 75aa91eed..b24794584 100644
--- a/addons_extensions/menu_control_center/security/ir.model.access.csv
+++ b/addons_extensions/menu_control_center/security/ir.model.access.csv
@@ -3,4 +3,5 @@ access_menu_access_control,access.menu.access.control,model_menu_access_control,
 access_menu_access_line,access.menu.access.line,model_menu_access_line,hr.group_hr_manager,1,1,1,1
 access_master_control_menu_line,access.master.control.menu.line,model_master_control_menu_line,hr.group_hr_manager,1,1,1,1
 access_master_control_public,master.control.public,model_master_control,base.group_public,1,0,0,0
+access_master_control_user,master.control.user,model_master_control,base.group_user,1,0,0,0
 access_master_control_hr,master.control.hr,model_master_control,hr.group_hr_manager,1,1,1,1