diff --git a/pms/models/pms_folio.py b/pms/models/pms_folio.py
index 998ebf23f..b0ef1c334 100644
--- a/pms/models/pms_folio.py
+++ b/pms/models/pms_folio.py
@@ -573,6 +573,7 @@ class PmsFolio(models.Model):
         store=True,
         readonly=False,
     )
+    lang = fields.Selection(selection='_get_languages', string='Language', validate=False)
 
     def name_get(self):
         result = []
@@ -1480,6 +1481,9 @@ class PmsFolio(models.Model):
 
         return res
 
+    @api.model
+    def _get_languages(self):
+        return self.env['res.lang'].get_installed()
     def get_reservations_to_update_channel(self, vals):
         reservations_to_update = self.env["pms.reservation"]
         for record in self:
diff --git a/pms/models/pms_reservation.py b/pms/models/pms_reservation.py
index 18404df90..6694aecc2 100644
--- a/pms/models/pms_reservation.py
+++ b/pms/models/pms_reservation.py
@@ -706,6 +706,7 @@ class PmsReservation(models.Model):
         related="room_type_id.overnight_room",
         store=True,
     )
+    # TODO: This field is deprecated
     lang = fields.Many2one(
         string="Language", comodel_name="res.lang", compute="_compute_lang"
     )
diff --git a/pms/templates/pms_email_template.xml b/pms/templates/pms_email_template.xml
index d21955c07..6f18679a4 100644
--- a/pms/templates/pms_email_template.xml
+++ b/pms/templates/pms_email_template.xml
@@ -144,7 +144,7 @@
             >${('%s &lt;%s&gt;' % (object.pms_property_id.partner_id.name, object.pms_property_id.partner_id.email) or '')|safe}</field>
             <field name="email_to">${(object.email or '')|safe}</field>
             <field name="partner_to">${(object.partner_id.id or '')}</field>
-            <field name="lang">${object.partner_id.lang}</field>
+            <field name="lang">${object.lang}</field>
             <field name="subject">
                 Your reservation ${object.name} has been confirmed by the property staff
             </field>