diff --git a/ui/core/app/router.js b/ui/core/app/router.js
index 748ad73a6..3f4ef8eff 100644
--- a/ui/core/app/router.js
+++ b/ui/core/app/router.js
@@ -97,6 +97,7 @@ Router.map(function () {
   });
 
   this.route('account', function() {
-    this.route('change-password');
+    // Enable after full account feature implementation
+    // this.route('change-password');
   });
 });
diff --git a/ui/core/app/templates/application.hbs b/ui/core/app/templates/application.hbs
index f8de5b3f9..d63eee931 100644
--- a/ui/core/app/templates/application.hbs
+++ b/ui/core/app/templates/application.hbs
@@ -19,9 +19,9 @@
             @iconOnly={{true}}
             @icon="boundary-icons/user-profile" as |dropdown|
           >
-            <dropdown.link @route="account.change-password">
+            {{!-- <dropdown.link @route="account.change-password">
               {{t 'actions.change-password'}}
-            </dropdown.link>
+            </dropdown.link> --}}
             <dropdown.button
               {{on "click" (route-action "invalidateSession")}}
             >
diff --git a/ui/core/tests/acceptance/accounts/change-password-test.js b/ui/core/tests/acceptance/accounts/change-password-test.js
index 27a28ba3d..fee06b101 100644
--- a/ui/core/tests/acceptance/accounts/change-password-test.js
+++ b/ui/core/tests/acceptance/accounts/change-password-test.js
@@ -1,3 +1,5 @@
+// Enable after account workflow implementation
+/*
 import { module, test } from 'qunit';
 import { visit, currentURL, click, find, fillIn } from '@ember/test-helpers';
 import { setupApplicationTest } from 'ember-qunit';
@@ -15,6 +17,7 @@ module('Acceptance | accounts | change password', function (hooks) {
   setupApplicationTest(hooks);
   setupMirage(hooks);
 
+
   const instances = {
     scopes: {
       global: null,
@@ -114,4 +117,6 @@ module('Acceptance | accounts | change password', function (hooks) {
     await visit(urls.changePassword);
     assert.notEqual(currentURL(), urls.changePassword);
   });
+
 });
+*/
diff --git a/ui/core/tests/unit/routes/account/change-password-test.js b/ui/core/tests/unit/routes/account/change-password-test.js
index ee6856d35..4481d783e 100644
--- a/ui/core/tests/unit/routes/account/change-password-test.js
+++ b/ui/core/tests/unit/routes/account/change-password-test.js
@@ -5,7 +5,8 @@ module('Unit | Route | account/change-password', function(hooks) {
   setupTest(hooks);
 
   test('it exists', function(assert) {
-    let route = this.owner.lookup('route:account/change-password');
-    assert.ok(route);
+    // let route = this.owner.lookup('route:account/change-password');
+    // assert.ok(route);
+    assert.expect(0);
   });
 });