diff --git a/hr_employee_firstname/views/base_config_view.xml b/hr_employee_firstname/views/base_config_view.xml
index 02b92938d4d..aa0eba7340e 100644
--- a/hr_employee_firstname/views/base_config_view.xml
+++ b/hr_employee_firstname/views/base_config_view.xml
@@ -6,14 +6,11 @@
         <field name="inherit_id" ref="base_setup.res_config_settings_view_form" />
         <field name="arch" type="xml">
             <xpath expr="//div[@id='companies']" position='after'>
-                <h2>Employee Names Order</h2>
-                <div class="row mt16 o_settings_container" name="employee_names_order">
-                    <div class="col-xs-12 col-md-6 o_setting_box">
-                        <div class="o_setting_right_pane">
-                            <field name="employee_names_order" />
-                        </div>
-                    </div>
-                </div>
+                <block title="Employee Names Order" id="hr_employee_firstname_settings">
+                    <setting id="employee_names_order">
+                        <field name="employee_names_order" nolabel="1" />
+                    </setting>
+                </block>
             </xpath>
         </field>
     </record>