diff --git a/addons_extensions/hr_recruitment_extended/data/mail_template.xml b/addons_extensions/hr_recruitment_extended/data/mail_template.xml
index 10c704b32..612894f91 100644
--- a/addons_extensions/hr_recruitment_extended/data/mail_template.xml
+++ b/addons_extensions/hr_recruitment_extended/data/mail_template.xml
@@ -676,7 +676,7 @@
                         <t t-set="locations" t-value="''"/>
                     </t>
                 </t>
-                <div style="margin: 0; padding: 0; font-size: 13px; line-height: 1.6;">
+                <div style="margin: 0; padding: 0; font-size: 13px; line-height: 1.6; background:#ffffff; color:#000000;">
                     <p>Dear Sir/Madam,</p>
                     <p>Please find the applicant details below for your review.</p>
                     <table style="width: 100%; border-collapse: collapse; margin: 16px 0;">
@@ -787,7 +787,7 @@
                 <t t-set="locations" t-value="', '.join(object.locations.mapped('location_name')) if object.locations else ''"/>
                 <t t-set="primary_skills" t-value="', '.join(object.skill_ids.mapped('name')) if object.skill_ids else ''"/>
                 <t t-set="secondary_skills" t-value="', '.join(object.secondary_skill_ids.mapped('name')) if object.secondary_skill_ids else ''"/>
-                <div style="margin: 0; padding: 0; font-size: 13px; line-height: 1.6;">
+                <div style="margin: 0; padding: 0; font-size: 13px; line-height: 1.6; background:#ffffff; color:#000000;">
                     <p>Dear Sir/Madam,</p>
                     <p>Please find the job description and hiring details below for your review and sourcing support.</p>
                     <table style="width: 100%; border-collapse: collapse; margin: 16px 0;">
diff --git a/addons_extensions/hr_recruitment_extended/wizards/client_submission_mail_template_wizard.py b/addons_extensions/hr_recruitment_extended/wizards/client_submission_mail_template_wizard.py
index 761d36367..3a9ecb5cb 100644
--- a/addons_extensions/hr_recruitment_extended/wizards/client_submission_mail_template_wizard.py
+++ b/addons_extensions/hr_recruitment_extended/wizards/client_submission_mail_template_wizard.py
@@ -26,7 +26,6 @@ class ClientSubmissionsMailTemplateWizard(models.TransientModel):
 
     @api.onchange('template_id')
     def _onchange_template_id(self):
-        """Update the email fields based on the selected template."""
         if not self.template_id:
             return
 
@@ -36,10 +35,7 @@ class ClientSubmissionsMailTemplateWizard(models.TransientModel):
         if not record_id:
             return
 
-        record = self.env[self.template_id.model].browse(record_id)
-
-        if not record.exists():
-            raise UserError("The record does not exist or is not accessible.")
+        record = self.env[active_model].browse(record_id)
 
         self.email_from = record.user_id.partner_id.email
 
@@ -48,8 +44,17 @@ class ClientSubmissionsMailTemplateWizard(models.TransientModel):
         else:
             self.email_to = record.requested_by.email
 
-        self.email_subject = self.template_id.subject
-        self.email_body = self.template_id.body_html
+        # Render subject
+        self.email_subject = self.template_id._render_field(
+            'subject',
+            [record.id],
+        )[record.id]
+
+        # Render body
+        self.email_body = self.template_id._render_field(
+            'body_html',
+            [record.id],
+        )[record.id]
 
     def action_send_email(self):
         """Send email and create recruitment share tracker."""
@@ -102,8 +107,8 @@ class ClientSubmissionsMailTemplateWizard(models.TransientModel):
                 'client_name': client_name,
             }
 
-            tracker_values['email_from'] = self.email_from,
-            tracker_values['email_to'] = self.email_to,
+            tracker_values['email_from'] = self.email_from
+            tracker_values['email_to'] = self.email_to
 
             template.sudo().with_context(**render_ctx).send_mail(
                 record.id,