diff --git a/ui/core/app/components/form/account/password/index.js b/ui/core/app/components/form/account/password/index.js
index e80e48c95..6b500094d 100644
--- a/ui/core/app/components/form/account/password/index.js
+++ b/ui/core/app/components/form/account/password/index.js
@@ -1,6 +1,7 @@
 import Component from '@glimmer/component';
 import { tracked } from '@glimmer/tracking';
 import { action } from '@ember/object';
+import { next } from '@ember/runloop';
 
 export default class FormAccountPasswordIndexComponent extends Component {
 
@@ -31,7 +32,7 @@ export default class FormAccountPasswordIndexComponent extends Component {
   @action
   submit(fn) {
     const password = this.password;
-    this.resetPassword();
+    next(() => this.resetPassword());
     this.args.model.isNew ? fn(password) : fn();
   }
 }
diff --git a/ui/core/app/components/form/account/password/set-password/index.js b/ui/core/app/components/form/account/password/set-password/index.js
index 477c14cee..e034e0995 100644
--- a/ui/core/app/components/form/account/password/set-password/index.js
+++ b/ui/core/app/components/form/account/password/set-password/index.js
@@ -2,6 +2,7 @@ import Component from '@glimmer/component';
 import { tracked } from '@glimmer/tracking';
 import { computed } from '@ember/object';
 import { action } from '@ember/object';
+import { next } from '@ember/runloop';
 
 export default class FormAccountPasswordSetPasswordIndexComponent extends Component {
 
@@ -40,7 +41,7 @@ export default class FormAccountPasswordSetPasswordIndexComponent extends Compon
   @action
   submit(fn) {
     const password = this.password;
-    this.resetPassword();
+    next(() => this.resetPassword());
     fn(password);
   }