diff --git a/pms/data/cron_jobs.xml b/pms/data/cron_jobs.xml
index a3651d947..ec067d944 100644
--- a/pms/data/cron_jobs.xml
+++ b/pms/data/cron_jobs.xml
@@ -64,21 +64,23 @@
         <!-- Scheduler for send confirmed email -->
         <record model="ir.cron" id="send_confirmation_email_folio">
             <field name="name">Send Confirmation Email</field>
-            <field name="interval_number">1</field>
+            <field name="interval_number">5</field>
             <field name="user_id" ref="base.user_root" />
             <field name="interval_type">minutes</field>
+            <field name="active" eval="False" />
             <field name="numbercall">-1</field>
             <field name="doall" eval="False" />
             <field name="state">code</field>
             <field name="model_id" ref="model_pms_folio" />
-            <field name="nextcall" eval="DateTime.now()" />
+            <field name="nextcall" eval="DateTime.now() + timedelta(days=1)" />
             <field name="code">model.send_confirmation_mail()</field>
         </record>
         <record model="ir.cron" id="send_modification_email_folio">
             <field name="name">Send Modification Email</field>
-            <field name="interval_number">1</field>
+            <field name="interval_number">5</field>
             <field name="user_id" ref="base.user_root" />
             <field name="interval_type">minutes</field>
+            <field name="active" eval="False" />
             <field name="numbercall">-1</field>
             <field name="doall" eval="False" />
             <field name="state">code</field>
@@ -88,8 +90,9 @@
         </record>
         <record model="ir.cron" id="send_cancelation_email_folio">
             <field name="name">Send Cancellation Email</field>
-            <field name="interval_number">1</field>
+            <field name="interval_number">5</field>
             <field name="user_id" ref="base.user_root" />
+            <field name="active" eval="False" />
             <field name="interval_type">minutes</field>
             <field name="numbercall">-1</field>
             <field name="doall" eval="False" />
diff --git a/pms/models/pms_property.py b/pms/models/pms_property.py
index 01b30bf5a..7f2be5011 100644
--- a/pms/models/pms_property.py
+++ b/pms/models/pms_property.py
@@ -122,35 +122,26 @@ class PmsProperty(models.Model):
     privacy_policy = fields.Html(string="Privacy Policy", help="Mail privacy policy ")
 
     property_confirmed_template = fields.Many2one(
-        string="Confirmation Template",
+        string="Confirmation Email",
         help="Confirmation email template",
         comodel_name="mail.template",
-        default=lambda self: self.env["mail.template"]
-        .search([("name", "=", "Confirmed Reservation")])
-        .id,
     )
 
     property_modified_template = fields.Many2one(
-        string="Modification Template",
+        string="Modification Email",
         help="Modification email template",
         comodel_name="mail.template",
-        default=lambda self: self.env["mail.template"]
-        .search([("name", "=", "Modified Reservation")])
-        .id,
     )
 
     property_canceled_template = fields.Many2one(
-        string="Cancellation Template",
+        string="Cancellation Email",
         help="Cancellation email template",
         comodel_name="mail.template",
-        default=lambda self: self.env["mail.template"]
-        .search([("name", "=", "Cancelled Reservation")])
-        .id,
     )
 
-    is_confirmed_auto_mail = fields.Boolean(string="Auto send mail")
-    is_modified_auto_mail = fields.Boolean(string="Auto send mail")
-    is_canceled_auto_mail = fields.Boolean(string="Auto send mail")
+    is_confirmed_auto_mail = fields.Boolean(string="Auto Send Confirmation Mail")
+    is_modified_auto_mail = fields.Boolean(string="Auto Send Modification Mail")
+    is_canceled_auto_mail = fields.Boolean(string="Auto Send Cancellation Mail")
 
     @api.depends_context(
         "checkin",
diff --git a/pms/views/pms_property_views.xml b/pms/views/pms_property_views.xml
index 31f8e09e9..f1ba521dc 100644
--- a/pms/views/pms_property_views.xml
+++ b/pms/views/pms_property_views.xml
@@ -89,25 +89,37 @@
                             <group>
                                 <div class="row">
                                     <div class="col-6">
-                                        <group string="Email Templates">
-                                            <field name="property_confirmed_template" />
-                                            <field name="property_modified_template" />
-                                            <field name="property_canceled_template" />
+                                        <group
+                                            string="Email Templates"
+                                            name="email_templates"
+                                        >
+                                            <field
+                                                string="Confirmation Email"
+                                                name="property_confirmed_template"
+                                            />
+                                            <field
+                                                string="Modification Email"
+                                                name="property_modified_template"
+                                            />
+                                            <field
+                                                string="Cancellation Email"
+                                                name="property_canceled_template"
+                                            />
                                         </group>
                                     </div>
                                     <div class="col-6">
-                                        <group string="Auto Send Mail">
+                                        <group string="Auto Send Email">
                                             <field
                                                 name="is_confirmed_auto_mail"
-                                                string="Confirmation Mail"
+                                                string="Confirmation Email"
                                             />
                                             <field
                                                 name="is_modified_auto_mail"
-                                                string="Modification Mail"
+                                                string="Modification Email"
                                             />
                                             <field
                                                 name="is_canceled_auto_mail"
-                                                string="Cancellation Mail"
+                                                string="Cancellation Email"
                                             />
                                         </group>
                                     </div>