diff --git a/pms_api_rest/__manifest__.py b/pms_api_rest/__manifest__.py
index e235886f1..0664236b5 100644
--- a/pms_api_rest/__manifest__.py
+++ b/pms_api_rest/__manifest__.py
@@ -20,7 +20,10 @@
     "data": [
         "data/auth_jwt_validator.xml",
         "views/pms_property_views.xml",
-        "views/res_users_views.xml"
+        "views/res_users_views.xml",
+    ],
+    "demo": [
+        "demo/pms_api_rest_master_data.xml",
     ],
     "installable": True,
 }
diff --git a/pms_api_rest/datamodels/pms_user.py b/pms_api_rest/datamodels/pms_user.py
index 2c2dee967..51e01ab3d 100644
--- a/pms_api_rest/datamodels/pms_user.py
+++ b/pms_api_rest/datamodels/pms_user.py
@@ -18,4 +18,6 @@ class PmsApiRestUserOutput(Datamodel):
     userImageBase64 = fields.String(required=False, allow_none=True)
     defaultPropertyId = fields.Integer(required=True, allow_none=False)
     defaultPropertyName = fields.String(required=True, allow_none=False)
-    availabilityRuleFields = fields.List(fields.String(), required=False, allow_none=True)
+    availabilityRuleFields = fields.List(
+        fields.String(), required=False, allow_none=True
+    )
diff --git a/pms_api_rest/demo/pms_api_rest_master_data.xml b/pms_api_rest/demo/pms_api_rest_master_data.xml
new file mode 100644
index 000000000..bca00d717
--- /dev/null
+++ b/pms_api_rest/demo/pms_api_rest_master_data.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <data noupdate="1">
+        <record id="base.user_admin" model="res.users">
+            <field
+                name="availability_rule_field_ids"
+                eval="[(6, 0, [ref('pms.field_pms_availability_plan_rule__min_stay'), ref('pms.field_pms_availability_plan_rule__quota')])]"
+            />
+        </record>
+        <record id="base.user_demo" model="res.users">
+            <field
+                name="availability_rule_field_ids"
+                eval="[(6, 0, [ref('pms.field_pms_availability_plan_rule__min_stay'), ref('pms.field_pms_availability_plan_rule__quota')])]"
+            />
+        </record>
+    </data>
+</odoo>
diff --git a/pms_api_rest/models/res_users.py b/pms_api_rest/models/res_users.py
index cb2c94328..f6bd3db21 100644
--- a/pms_api_rest/models/res_users.py
+++ b/pms_api_rest/models/res_users.py
@@ -7,16 +7,20 @@ class ResUsers(models.Model):
     availability_rule_field_ids = fields.Many2many(
         string="Availability Rules",
         help="Configurable availability rules",
-        default=lambda self: self._get_default_avail_rule_fields(),
+        default=lambda self: self._default_avail_rule_fields(),
         comodel_name="ir.model.fields",
         relation="ir_model_fields_res_users_rel",
         column1="ir_model_fields",
         column2="res_users",
-
     )
 
-    def _get_default_avail_rule_fields(self):
-        default_avail_rule_fields = self.env['ir.model.fields'].search([('model_id', '=', 'pms.availability.plan.rule'), ('name', 'in', ('min_stay', 'quota'))])
+    def _default_avail_rule_fields(self):
+        default_avail_rule_fields = self.env["ir.model.fields"].search(
+            [
+                ("model_id", "=", "pms.availability.plan.rule"),
+                ("name", "in", ("min_stay", "quota")),
+            ]
+        )
         if default_avail_rule_fields:
             return default_avail_rule_fields.ids
         else:
diff --git a/pms_api_rest/services/pms_availability_plan_service.py b/pms_api_rest/services/pms_availability_plan_service.py
index c5a2c9077..bf3292d9f 100644
--- a/pms_api_rest/services/pms_availability_plan_service.py
+++ b/pms_api_rest/services/pms_availability_plan_service.py
@@ -200,7 +200,6 @@ class PmsAvailabilityPlanService(Component):
     def write_availability_plan_rule(
         self, availability_plan_id, availability_plan_rule_id, pms_avail_plan_rule_info
     ):
-        vals = dict()
         avail_rule = self.env["pms.availability.plan.rule"].search(
             [
                 ("availability_plan_id", "=", availability_plan_id),
@@ -216,6 +215,6 @@ class PmsAvailabilityPlanService(Component):
                     "quota": pms_avail_plan_rule_info.quota,
                     "closed": pms_avail_plan_rule_info.closed,
                     "closed_departure": pms_avail_plan_rule_info.closedDeparture,
-                    "closed_arrival": pms_avail_plan_rule_info.closedArrival
+                    "closed_arrival": pms_avail_plan_rule_info.closedArrival,
                 }
             )
diff --git a/pms_api_rest/services/pms_property_service.py b/pms_api_rest/services/pms_property_service.py
index 042047941..d889e3237 100644
--- a/pms_api_rest/services/pms_property_service.py
+++ b/pms_api_rest/services/pms_property_service.py
@@ -65,7 +65,6 @@ class PmsPropertyService(Component):
     def get_property(self, property_id):
         pms_property = self.env["pms.property"].search([("id", "=", property_id)])
         res = []
-        avail_rule_names = []
         PmsPropertyInfo = self.env.datamodels["pms.property.info"]
         if not pms_property:
             pass
diff --git a/pms_api_rest/views/res_users_views.xml b/pms_api_rest/views/res_users_views.xml
index a51ff887a..9f77bf081 100644
--- a/pms_api_rest/views/res_users_views.xml
+++ b/pms_api_rest/views/res_users_views.xml
@@ -5,7 +5,10 @@
         <field name="model">res.users</field>
         <field name="inherit_id" ref="base.view_users_form" />
         <field name="arch" type="xml">
-            <xpath expr="//page[@name='references']/group[@name='messaging']" position="after">
+            <xpath
+                expr="//page[@name='references']/group[@name='messaging']"
+                position="after"
+            >
                 <group>
                     <group string="Configurable Availability Rules">
                         <field