diff --git a/test_themes/tests/test_new_page_templates.py b/test_themes/tests/test_new_page_templates.py
index 2a999ac92..c0461d3d4 100644
--- a/test_themes/tests/test_new_page_templates.py
+++ b/test_themes/tests/test_new_page_templates.py
@@ -89,7 +89,7 @@ CONFLICTUAL_CLASSES_RE = {
         's_product_catalog_dish_name', 's_product_catalog_dish_dot_leaders',
         's_table_of_content_vertical_navbar', 's_table_of_content_navbar_sticky', 's_table_of_content_navbar_wrap',
         's_timeline_card',
-        's_website_form_custom', 's_website_form_dnone', 's_website_form_field', 's_website_form_input', 's_website_form_mark',
+        's_website_form_custom', 's_website_form_dnone', 's_website_form_field', 's_website_form_input', 's_website_form_mark', 's_website_form_submit', 's_website_form_no_submit_label',
         's_donation_btn', 's_donation_custom_btn',
     ],
     # Text
diff --git a/theme_buzzy/views/new_page_template.xml b/theme_buzzy/views/new_page_template.xml
index 0e6df2e9d..e677df279 100644
--- a/theme_buzzy/views/new_page_template.xml
+++ b/theme_buzzy/views/new_page_template.xml
@@ -114,7 +114,7 @@
 
 <template id="new_page_template_s_website_form" inherit_id="website.new_page_template_s_website_form">
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="o_cc2" separator=" "/>
+        <attribute name="class" add="o_cc5" remove="o_cc2" separator=" "/>
     </xpath>
 </template>