diff --git a/addons_extensions/employee_jod/models/emp_jod.py b/addons_extensions/employee_jod/models/emp_jod.py
index 2612a96bc..3fca8995b 100644
--- a/addons_extensions/employee_jod/models/emp_jod.py
+++ b/addons_extensions/employee_jod/models/emp_jod.py
@@ -16,7 +16,7 @@ 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),'|',('company_id','=',False),('company_id','=',self.env.company.id)], limit=1)
+                application = self.env['hr.applicant'].sudo().search(['|','|',('partner_phone','=',rec.work_phone),('email_from','=',rec.work_email),('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,
@@ -76,7 +76,7 @@ class PostOnboardingAttachmentWizard(models.TransientModel):
         for rec in self:
             self.ensure_one()
             context = self.env.context
-            active_id = context.get('applicant_id')
+            active_id = context.get('active_id')
             model = context.get('active_model')
             request_token = False
             request_upload_url = False