diff --git a/assets/javascripts/discourse/components/custom-wizard-step.js.es6 b/assets/javascripts/discourse/components/custom-wizard-step.js.es6
index cb34cd68..44bef872 100644
--- a/assets/javascripts/discourse/components/custom-wizard-step.js.es6
+++ b/assets/javascripts/discourse/components/custom-wizard-step.js.es6
@@ -1,6 +1,5 @@
 import discourseComputed, { observes } from "discourse-common/utils/decorators";
 import Component from "@ember/component";
-import I18n from "I18n";
 import getUrl from "discourse-common/lib/get-url";
 import { htmlSafe } from "@ember/template";
 import { schedule } from "@ember/runloop";
@@ -11,8 +10,6 @@ import CustomWizard, {
 import { alias, not } from "@ember/object/computed";
 import discourseLater from "discourse-common/lib/later";
 
-const alreadyWarned = {};
-
 export default Component.extend({
   classNameBindings: [":wizard-step", "step.id"],
   saving: null,
@@ -199,7 +196,7 @@ export default Component.extend({
 
       this.step.validate();
 
-      if (step.get("valid")) {
+      if (this.step.get("valid")) {
         this.advance();
       } else {
         this.autoFocus();
diff --git a/assets/javascripts/discourse/routes/custom-wizard.js.es6 b/assets/javascripts/discourse/routes/custom-wizard.js.es6
index a7c2c7ea..e7871423 100644
--- a/assets/javascripts/discourse/routes/custom-wizard.js.es6
+++ b/assets/javascripts/discourse/routes/custom-wizard.js.es6
@@ -42,7 +42,7 @@ export default DiscourseRoute.extend({
       },
     ];
 
-    this.dialog.dialog({ title, buttons, type: 'confirm' });
+    this.dialog.dialog({ title, buttons, type: "confirm" });
   },
 
   afterModel(model) {