diff --git a/website_whatsapp/__manifest__.py b/website_whatsapp/__manifest__.py
index 8da103995a..81fea4410d 100644
--- a/website_whatsapp/__manifest__.py
+++ b/website_whatsapp/__manifest__.py
@@ -4,7 +4,7 @@
     "name": "Website Whatsapp",
     "summary": "Whatsapp integration",
     "category": "Website",
-    "version": "16.0.1.0.1",
+    "version": "17.0.1.0.0",
     "website": "https://github.com/OCA/website",
     "author": "Studio73, Odoo Community Association (OCA)",
     "maintainers": ["ioans73"],
diff --git a/website_whatsapp/views/res_config_settings.xml b/website_whatsapp/views/res_config_settings.xml
index 7e30cd2eff..e6aeb5bf75 100644
--- a/website_whatsapp/views/res_config_settings.xml
+++ b/website_whatsapp/views/res_config_settings.xml
@@ -4,25 +4,19 @@
         <field name="model">res.config.settings</field>
         <field name="inherit_id" ref="website.res_config_settings_view_form" />
         <field name="arch" type="xml">
-            <xpath expr="//div[@id='website_email_marketing']" position="inside">
-                <div
-                    class="col-12 col-lg-6 o_setting_box"
-                    id="website_whatsapp_setting"
-                >
-                    <div class="o_setting_left_pane">
+            <xpath expr="//block[@id='website_email_marketing']" position="inside">
+                <setting class="col-12 col-lg-6" id="website_whatsapp_setting">
+                    <div>
                         <field name="whatsapp_enabled" />
                     </div>
-                    <div class="o_setting_right_pane">
+                    <div>
                         <label for="whatsapp_enabled" />
                         <span
                             class="fa fa-lg fa-globe"
                             title="Values set here are website-specific."
                             groups="website.group_multi_website"
                         />
-                        <div
-                            class="content-group"
-                            attrs="{'invisible': [('whatsapp_enabled', '=', False)]}"
-                        >
+                        <div class="content-group" invisible="not whatsapp_enabled">
                             <div class="text-muted">
                                 You must add the mobile number with the country prefix
                             </div>
@@ -33,7 +27,7 @@
                                 />
                                 <field
                                     name="whatsapp_number"
-                                    attrs="{'required': [('whatsapp_enabled', '=', True)]}"
+                                    required="whatsapp_enabled"
                                 />
                             </div>
                             <div class="row">
@@ -52,7 +46,7 @@
                             </div>
                         </div>
                     </div>
-                </div>
+                </setting>
             </xpath>
         </field>
     </record>