diff --git a/addons/website/static/src/js/tours/rte.js b/addons/website/static/src/js/tours/rte.js
index 67426a64303..58ddca69424 100644
--- a/addons/website/static/src/js/tours/rte.js
+++ b/addons/website/static/src/js/tours/rte.js
@@ -6,6 +6,7 @@ var base = require('web_editor.base');
 
 tour.register('rte_translator', {
     test: true,
+    url: '/',
     wait_for: base.ready(),
 }, [{
     content: "click on Add a language",
diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml
index cc7cff9ca93..a3bd1d3f246 100644
--- a/addons/website/views/website_templates.xml
+++ b/addons/website/views/website_templates.xml
@@ -401,7 +401,7 @@
             </div>
         </li>
         <li groups="website.group_website_publisher" class="list-inline-item">
-            <t t-set="url_return" t-value="url_for('', '[lang]') + '?' + keep_query()"/>
+            <t t-set="url_return" t-value="quote_plus(url_for('', '[lang]') + '?' + keep_query())"/>
             <a t-attf-href="/web#action=base.action_view_base_language_install&amp;website_id=#{website.id if website else ''}&amp;url_return=#{url_return}">
                 <i class="fa fa-plus-circle"/>
                 Add a language...