diff --git a/helpdesk_mgmt/controllers/main.py b/helpdesk_mgmt/controllers/main.py
index fd8dad0543..4ba3c1e6d0 100644
--- a/helpdesk_mgmt/controllers/main.py
+++ b/helpdesk_mgmt/controllers/main.py
@@ -75,6 +75,11 @@ def _prepare_submit_ticket_vals(self, **kw):
             "partner_id": request.env.user.partner_id.id,
             "partner_name": request.env.user.partner_id.name,
             "partner_email": request.env.user.partner_id.email,
+            # Need to set stage_id so that the _track_template() method is called
+            # and the mail is sent automatically if applicable
+            "stage_id": request.env["helpdesk.ticket"].default_get(["stage_id"])[
+                "stage_id"
+            ],
         }
         if company.helpdesk_mgmt_portal_select_team:
             team = (
diff --git a/helpdesk_mgmt/models/helpdesk_ticket.py b/helpdesk_mgmt/models/helpdesk_ticket.py
index f8081f1bfa..b8c8a3669d 100644
--- a/helpdesk_mgmt/models/helpdesk_ticket.py
+++ b/helpdesk_mgmt/models/helpdesk_ticket.py
@@ -180,6 +180,8 @@ def _track_template(self, tracking):
             res["stage_id"] = (
                 ticket.stage_id.mail_template_id,
                 {
+                    # Need to set mass_mail so that the email will always be sent
+                    "composition_mode": "mass_mail",
                     "auto_delete_message": True,
                     "subtype_id": self.env["ir.model.data"]._xmlid_to_res_id(
                         "mail.mt_note"