diff --git a/pms/models/pms_folio.py b/pms/models/pms_folio.py
index c8bcc5df7..3b03cb965 100644
--- a/pms/models/pms_folio.py
+++ b/pms/models/pms_folio.py
@@ -461,9 +461,7 @@ class PmsFolio(models.Model):
             elif folio.partner_id and folio.partner_id.property_product_pricelist:
                 folio.pricelist_id = folio.partner_id.property_product_pricelist.id
             elif not folio.pricelist_id.id:
-                folio.pricelist_id = (
-                    self.env.user.pms_property_id.default_pricelist_id.id
-                )
+                folio.pricelist_id = folio.pms_property_id.default_pricelist_id.id
 
     @api.depends("agency_id")
     def _compute_partner_id(self):
@@ -814,9 +812,7 @@ class PmsFolio(models.Model):
     # ORM Overrides
     @api.model
     def create(self, vals):
-        # TODO: Make sequence from property, not company
         if vals.get("name", _("New")) == _("New") or "name" not in vals:
-            # TODO: change for property env variable
             pms_property_id = (
                 self.env.user.pms_property_id.id
                 if "pms_property_id" not in vals
diff --git a/pms/models/pms_reservation.py b/pms/models/pms_reservation.py
index 31d4521bf..f89a329c5 100644
--- a/pms/models/pms_reservation.py
+++ b/pms/models/pms_reservation.py
@@ -46,8 +46,7 @@ class PmsReservation(models.Model):
 
     def _get_default_arrival_hour(self):
         folio = False
-        # TODO: Change by property env variable (like company)
-        default_arrival_hour = self.env.user.pms_property_id.default_arrival_hour
+        default_arrival_hour = self.pms_property_id.default_arrival_hour
         if "folio_id" in self._context:
             folio = self.env["pms.folio"].search(
                 [("id", "=", self._context["folio_id"])]
@@ -59,8 +58,7 @@ class PmsReservation(models.Model):
 
     def _get_default_departure_hour(self):
         folio = False
-        # TODO: Change by property env variable (like company)
-        default_departure_hour = self.env.user.pms_property_id.default_departure_hour
+        default_departure_hour = self.pms_property_id.default_departure_hour
         if "folio_id" in self._context:
             folio = self.env["pms.folio"].search(
                 [("id", "=", self._context["folio_id"])]
@@ -723,7 +721,7 @@ class PmsReservation(models.Model):
                 )
             elif not reservation.pricelist_id.id:
                 reservation.pricelist_id = (
-                    self.env.user.pms_property_id.default_pricelist_id.id
+                    reservation.pms_property_id.default_pricelist_id.id
                 )
 
     @api.depends("pricelist_id")
@@ -1537,7 +1535,7 @@ class PmsReservation(models.Model):
         self.ensure_one()
         pricelist = self.pricelist_id
         if pricelist and pricelist.cancelation_rule_id:
-            tz_property = self.env.user.pms_property_id.tz
+            tz_property = self.pms_property_id.tz
             today = fields.Date.context_today(self.with_context(tz=tz_property))
             days_diff = (
                 fields.Date.from_string(self.checkin) - fields.Date.from_string(today)
diff --git a/pms/models/pms_room_type_availability_plan.py b/pms/models/pms_room_type_availability_plan.py
index 4b2c76794..0651bb0c8 100644
--- a/pms/models/pms_room_type_availability_plan.py
+++ b/pms/models/pms_room_type_availability_plan.py
@@ -17,7 +17,7 @@ class PmsRoomTypeAvailability(models.Model):
     # Default methods
     @api.model
     def _get_default_pms_property(self):
-        return self.env.user.pms_property_id or None
+        return self.env.user.get_active_property_ids()[0] or None
 
     # Fields declaration
     name = fields.Char("Availability Plan Name", required=True)
diff --git a/pms/models/res_users.py b/pms/models/res_users.py
index 726933f55..97552bf2f 100644
--- a/pms/models/res_users.py
+++ b/pms/models/res_users.py
@@ -8,11 +8,6 @@ from odoo.http import request
 class ResUsers(models.Model):
     _inherit = "res.users"
 
-    # Default Methods ang Gets
-    @api.model
-    def _get_default_pms_property(self):
-        return self.env.user.pms_property_id
-
     # Fields declaration
     pms_property_id = fields.Many2one(
         "pms.property",