diff --git a/addons/survey/views/gamification_badge_views.xml b/addons/survey/views/gamification_badge_views.xml
index 65547ba1b49..905f6d1c4df 100644
--- a/addons/survey/views/gamification_badge_views.xml
+++ b/addons/survey/views/gamification_badge_views.xml
@@ -15,9 +15,7 @@
                             <field name="name" placeholder="e.g. Problem Solver"/>
                         </h1>
                     </div>
-                    <group>
-                        <field name="description" nolabel="1" placeholder="e.g. No one can solve challenges like you do"/>
-                    </group>
+                    <field name="description" placeholder="e.g. No one can solve challenges like you do"/>
                     <group string="Rewards for challenges">
                         <field name="level"/>
                     </group>
diff --git a/addons/survey/views/survey_survey_views.xml b/addons/survey/views/survey_survey_views.xml
index b1c30f8567f..94134683579 100644
--- a/addons/survey/views/survey_survey_views.xml
+++ b/addons/survey/views/survey_survey_views.xml
@@ -129,10 +129,10 @@
                                     <field name="scoring_type" widget="radio" force_save="1"/>
                                     <field name="scoring_success_min" invisible="scoring_type == 'no_scoring'" />
                                     <label for="certification"
-                                           invisible="survey_type == 'live_session'"/>
+                                           invisible="survey_type == 'live_session' or scoring_type == 'no_scoring'"/>
                                     <div class="o_checkbox_optional_field"
                                          invisible="survey_type == 'live_session'">
-                                        <field name="certification" nolabel="1"/>
+                                        <field name="certification" invisible="scoring_type == 'no_scoring'"/>
                                         <div invisible="not certification" class="w-100">
                                             <field name="certification_report_layout" placeholder="Pick a Style..." class="w-50"/>
                                             <button name="action_survey_preview_certification_template"