fix: Password would reset when opening then cancelling/dismissing the PasswordOption dialog

fix: Password would reset when opening then cancelling/dismissing the PasswordOption dialog #1984