diff --git a/addons/website/static/src/js/website.tour.js b/addons/website/static/src/js/website.tour.js
index 743e3445fa5..28d80fb2272 100644
--- a/addons/website/static/src/js/website.tour.js
+++ b/addons/website/static/src/js/website.tour.js
@@ -316,15 +316,15 @@ var T = website.Tour = {
         state.step = state.tour.steps[state.step_id === -1 ? 0 : state.step_id];
         return state;
     },
-    error: function (message) {
+    error: function (step, message) {
         var state = T.getState();
         message += '\n tour: ' + state.id
-            + '\n step: ' + state.step_id + ": '" + (state.step._title || state.step.title) + "'"
+            + '\n step: ' + step.id + ": '" + (step._title || step.title) + "'"
             + '\n href: ' + window.location.href
             + '\n referrer: ' + document.referrer
-            + '\n element: ' + Boolean(!state.step.element || ($(state.step.element).size() && $(state.step.element).is(":visible") && !$(state.step.element).is(":hidden")))
-            + '\n waitNot: ' + Boolean(!state.step.waitNot || !$(state.step.waitNot).size())
-            + '\n waitFor: ' + Boolean(!state.step.waitFor || $(state.step.waitFor).size())
+            + '\n element: ' + Boolean(!step.element || ($(step.element).size() && $(step.element).is(":visible") && !$(step.element).is(":hidden")))
+            + '\n waitNot: ' + Boolean(!step.waitNot || !$(step.waitNot).size())
+            + '\n waitFor: ' + Boolean(!step.waitFor || $(step.waitFor).size())
             + "\n localStorage: " + JSON.stringify(localStorage)
             + '\n\n' + $("body").html();
         T.reset();
@@ -400,7 +400,7 @@ var T = website.Tour = {
             } else if (!overlaps || new Date().getTime() - time < overlaps) {
                 T.timer = setTimeout(checkNext, T.defaultDelay);
             } else {
-                T.error("Can't reach the next step");
+                T.error(next, "Can't reach the next step");
             }
         }
         checkNext();
diff --git a/addons/website_event_sale/static/src/js/website.tour.event_sale.js b/addons/website_event_sale/static/src/js/website.tour.event_sale.js
index 75ad2297f6b..9a200ece499 100644
--- a/addons/website_event_sale/static/src/js/website.tour.event_sale.js
+++ b/addons/website_event_sale/static/src/js/website.tour.event_sale.js
@@ -11,20 +11,15 @@
         steps: [
             {
                 title:     "select event",
-                element:   'a[href*="/event"]:contains("Open Days in Los Angeles")',
+                element:   'a[href*="/event"]:contains("Open Days in Los Angeles"):first',
             },
             {
                 title:     "go to register page",
                 waitNot:   'a[href*="/event"]:contains("Functional Webinar")',
                 autoComplete:   function () {
                     // use onload if website_event_track is installed
-                    console.log("--------------------------------------------");
-                    console.log($('form:contains("Ticket Type")').size());
-                    console.log("--------------------------------------------");
-                    console.log($('a[href*="/event"][href*="/register"]').attr("href"));
-                    console.log("--------------------------------------------");
                     if (!$('form:contains("Ticket Type")').size()) {
-                        window.location.href = $('a[href*="/event"][href*="/register"]').attr("href");
+                        window.location.href = $('a[href*="/event/Open-Days-in-Los-Angeles"][href*="/register"]').attr("href");
                     }
                 },
             },