diff --git a/addons/hr_attendance/models/res_config.py b/addons/hr_attendance/models/res_config.py
index d2f06ce6cb5..917a3e25c5f 100644
--- a/addons/hr_attendance/models/res_config.py
+++ b/addons/hr_attendance/models/res_config.py
@@ -7,6 +7,7 @@ from odoo import fields, models
 class BaseConfigSettings(models.TransientModel):
     _inherit = 'base.config.settings'
 
-    group_attendance_use_pin = fields.Selection([(0, 'Employees do not need to enter their PIN to check in manually in the "Kiosk Mode".'),
-                                                 (1, 'Employees must enter their PIN to check in manually in the "Kiosk Mode".')],
-                                                string='Employee PIN', help='Enable or disable employee PIN identification at check in', implied_group="hr_attendance.group_hr_attendance_use_pin")
+    group_attendance_use_pin = fields.Boolean(string='Employee PIN',
+        implied_group="hr_attendance.group_hr_attendance_use_pin")
+    module_hr_timesheet = fields.Boolean(string='Timesheets')
+    module_hr_holidays = fields.Boolean(string='Leave Management')
diff --git a/addons/hr_attendance/views/res_config_view.xml b/addons/hr_attendance/views/res_config_view.xml
index 9e1b9b5ef4c..fcd5bf31638 100644
--- a/addons/hr_attendance/views/res_config_view.xml
+++ b/addons/hr_attendance/views/res_config_view.xml
@@ -7,12 +7,50 @@
         <field name="arch" type="xml">
             <form string="Configuration" class= "oe_form_configuration">
                 <header>
-                    <button string="Apply" type="object" name="execute" class="oe_highlight"/>
+                    <button string="Save" type="object" name="execute" class="oe_highlight"/>
                     <button string="Cancel" type="object" name="cancel" class="oe_link"/>
                 </header>
-                <group string="Settings">
-                    <field name="group_attendance_use_pin" widget="radio"/>
-                </group>
+                <sheet>
+                    <h2>Check-In/Out</h2>
+                    <div class="row mt16 o_settings_container">
+                        <div class="col-xs-12 col-md-6 o_setting_box" title="Set PIN codes in the employee detail form (in HR Settings tab).">
+                            <div class="o_setting_left_pane">
+                                <field name="group_attendance_use_pin"/>
+                            </div>
+                            <div class="o_setting_right_pane">
+                                <label string="Employee PIN"/>
+                                <div class="text-muted">
+                                    Use PIN codes to check in in Kiosk Mode
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <h2>Recommended Apps</h2>
+                    <div class="row mt16 o_settings_container">
+                        <div class="col-xs-12 col-md-6 o_setting_box">
+                            <div class="o_setting_left_pane">
+                                <field name="module_hr_timesheet"/>
+                            </div>
+                            <div class="o_setting_right_pane">
+                                <label string="Timesheets"/>
+                                <div class="text-muted">
+                                    Track time spent by employees and compare with attendances
+                                </div>
+                            </div>
+                        </div>
+                        <div class="col-xs-12 col-md-6 o_setting_box">
+                            <div class="o_setting_left_pane">
+                                <field name="module_hr_holidays"/>
+                            </div>
+                            <div class="o_setting_right_pane">
+                                <label string="Leave Management"/>
+                                <div class="text-muted">
+                                    Manage leave allocations and requests
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </sheet>
             </form>
         </field>
     </record>