diff --git a/addons/survey/controllers/main.py b/addons/survey/controllers/main.py
index 446caf6a55e..320b0659ef9 100644
--- a/addons/survey/controllers/main.py
+++ b/addons/survey/controllers/main.py
@@ -367,7 +367,7 @@ class Survey(http.Controller):
             return {}
 
         survey_sudo, answer_sudo = access_data['survey_sudo'], access_data['answer_sudo']
-        if not survey_sudo._has_attempts_left(answer_sudo.partner_id, answer_sudo.email, answer_sudo.invite_token):
+        if not answer_sudo.test_entry and not survey_sudo._has_attempts_left(answer_sudo.partner_id, answer_sudo.email, answer_sudo.invite_token):
             # prevent cheating with users creating multiple 'user_input' before their last attempt
             return {}
 
@@ -509,7 +509,7 @@ class Survey(http.Controller):
         #     filter_finish: boolean => only finished surveys or not
         #
 
-    @http.route(['/survey/<int:survey_id>/get_certification'], type='http', auth='user', methods=['POST'], website=True)
+    @http.route(['/survey/<int:survey_id>/get_certification'], type='http', auth='user', methods=['GET'], website=True)
     def survey_get_certification(self, survey_id, **kwargs):
         """ The certification document can be downloaded as long as the user has succeeded the certification """
         survey = request.env['survey.survey'].sudo().search([
diff --git a/addons/survey/views/survey_templates.xml b/addons/survey/views/survey_templates.xml
index 6795ed1311a..d702466cd75 100644
--- a/addons/survey/views/survey_templates.xml
+++ b/addons/survey/views/survey_templates.xml
@@ -29,6 +29,15 @@
                             <div>You scored <t t-esc="answer.quizz_score" />%</div>
                             <t t-if="answer.quizz_passed">
                                 <div>Congratulations, you have passed the test!</div>
+
+                                <div t-if="survey.certificate" class="mt16 mb16">
+                                    <a role="button"
+                                        class="btn btn-primary btn-lg"
+                                        t-att-href="'/survey/%s/get_certification' % survey.id">
+                                        <i class="fa fa-fw fa-trophy" role="img" aria-label="Download certification" title="Download certification"/>
+                                        Download certification
+                                    </a>
+                                </div>
                             </t>
                             <t t-else="">
                                 <div>Unfortunately, you have failed the test.</div>
diff --git a/addons/website_slides_survey/static/src/js/slides_certification_download.js b/addons/website_slides_survey/static/src/js/slides_certification_download.js
deleted file mode 100644
index d1469ab63a8..00000000000
--- a/addons/website_slides_survey/static/src/js/slides_certification_download.js
+++ /dev/null
@@ -1,23 +0,0 @@
-odoo.define('website_slides_survey.certification_download', function (require) {
-'use strict';
-
-var WebsiteSlides = require('website_slides.slides');
-var session = require('web.session');
-
-WebsiteSlides.include({
-    events: _.extend({}, WebsiteSlides.prototype.events, {
-        'click .o_wslides_survey_download_certification': '_onDownloadCertificationClick'
-    }),
-
-    /**
-     * @private
-     */
-    _onDownloadCertificationClick: function () {
-        var surveyId = this.$('.o_wslides_survey_download_certification').data('survey_id');
-        session.get_file({
-            url: '/survey/' + surveyId + '/get_certification'
-        });
-    }
-});
-
-});
diff --git a/addons/website_slides_survey/static/src/xml/website_slides_fullscreen.xml b/addons/website_slides_survey/static/src/xml/website_slides_fullscreen.xml
index 6daa08ffe65..e76839db82a 100644
--- a/addons/website_slides_survey/static/src/xml/website_slides_fullscreen.xml
+++ b/addons/website_slides_survey/static/src/xml/website_slides_fullscreen.xml
@@ -5,8 +5,8 @@
             <div t-if="widget.get('slide').type === 'certification' &amp;&amp; !widget.get('slide').certificationDone" class="o_wslides_fs_certification">
                 <a class="btn btn-primary" t-att-href="'/slides/slide/' + widget.get('slide').id" target="new"><i class="fa fa-trophy"/> Pass Certification</a>
             </div>
-            <div class="o_wslides_fs_certification" t-if="widget.get('slide').type === 'certification' &amp;&amp; widget.get('slide').certificationDone">
-                <a role="button" t-att-data-survey_id="widget.get('slide').certificationId" class="btn btn-primary o_wslides_survey_download_certification" href="#">
+            <div class="o_wslides_fs_certification" t-if="widget.get('slide').type == 'certification' &amp;&amp; widget.get('slide').completed">
+                <a role="button" class="btn btn-primary" t-att-href="'/survey/' + widget.get('slide').certificationId + '/get_certification'">
                     <i class="fa fa-fw fa-trophy" role="img" aria-label="Download certification" title="Download certification"/> Download certification
                 </a>
             </div>
diff --git a/addons/website_slides_survey/views/assets.xml b/addons/website_slides_survey/views/assets.xml
index 7f239d7a1c9..d7aab12568d 100644
--- a/addons/website_slides_survey/views/assets.xml
+++ b/addons/website_slides_survey/views/assets.xml
@@ -7,7 +7,6 @@
             </xpath>
             <xpath expr="//script[last()]" position="after">
                 <script type="text/javascript" src="/website_slides_survey/static/src/js/slides_upload.js"/>
-                <script type="text/javascript" src="/website_slides_survey/static/src/js/slides_certification_download.js"/>
                 <link rel="stylesheet" type="text/scss" href="/website_slides_survey/static/src/scss/website_profile.scss"/>
                 <script type="text/javascript" src="/website_slides_survey/static/src/js/slides_course_fullscreen_player.js"/>
             </xpath>
diff --git a/addons/website_slides_survey/views/website_profile.xml b/addons/website_slides_survey/views/website_profile.xml
index 6b76420d3ac..aea158e7f82 100644
--- a/addons/website_slides_survey/views/website_profile.xml
+++ b/addons/website_slides_survey/views/website_profile.xml
@@ -25,9 +25,7 @@
                                 <span class="row">Score : <b t-field="certificate.quizz_score"/>%</span>
                                 <div class="row">
                                     <a role="button"
-                                        t-att-data-survey_id="certificate.survey_id.id"
-                                        class="o_wslides_survey_download_certification"
-                                        href="#">
+                                        t-att-href="'/survey/%s/get_certification' % certificate.survey_id.id">
                                         <i class="fa fa-download"/>
                                     </a>
                                 </div>
diff --git a/addons/website_slides_survey/views/website_slides_templates_lesson.xml b/addons/website_slides_survey/views/website_slides_templates_lesson.xml
index c6233535bed..4d1e2066a75 100644
--- a/addons/website_slides_survey/views/website_slides_templates_lesson.xml
+++ b/addons/website_slides_survey/views/website_slides_templates_lesson.xml
@@ -15,9 +15,8 @@
                 </div>
                 <div t-if="slide.slide_type == 'certification' and certification_done" class="col mt32 mb8 d-flex justify-content-center">
                     <a role="button"
-                        t-att-data-survey_id="survey_id"
-                        class="btn btn-primary btn-lg o_wslides_survey_download_certification"
-                        href="#">
+                        class="btn btn-primary btn-lg"
+                        t-att-href="'/survey/%s/get_certification' % survey_id">
                         <i class="fa fa-fw fa-trophy" role="img" aria-label="Download certification" title="Download certification"/>
                         Download certification
                     </a>