diff --git a/app/assets/javascripts/discourse/app/components/modal/forgot-password.js b/app/assets/javascripts/discourse/app/components/modal/forgot-password.js index 8b1d64b4ee2..516a3355d95 100644 --- a/app/assets/javascripts/discourse/app/components/modal/forgot-password.js +++ b/app/assets/javascripts/discourse/app/components/modal/forgot-password.js @@ -14,7 +14,8 @@ import { htmlSafe } from "@ember/template"; export default class ForgotPassword extends Component { @service siteSettings; - @tracked emailOrUsername = cookie("email") || this.args.model.emailOrUsername; + @tracked + emailOrUsername = cookie("email") || this.args.model?.emailOrUsername || ""; @tracked disabled = false; @tracked helpSeen = false; @tracked offerHelp; @@ -24,9 +25,9 @@ export default class ForgotPassword extends Component { if (this.disabled) { return true; } else if (this.siteSettings.hide_email_address_taken) { - return !(this.emailOrUsername || "").includes("@"); + return !this.emailOrUsername.includes("@"); } else { - return isEmpty((this.emailOrUsername || "").trim()); + return isEmpty(this.emailOrUsername.trim()); } }