diff --git a/src/Umbraco.Web.UI.Client/libs/modal/token/index.ts b/src/Umbraco.Web.UI.Client/libs/modal/token/index.ts
new file mode 100644
index 0000000000..b2db240cd6
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/libs/modal/token/index.ts
@@ -0,0 +1,9 @@
+import { UmbModalToken } from '@umbraco-cms/backoffice/modal';
+
+export interface UmbChangePasswordModalData {
+	requireOldPassword: boolean;
+}
+
+export const UMB_CHANGE_PASSWORD_MODAL = new UmbModalToken<UmbChangePasswordModalData>('Umb.Modal.ChangePassword', {
+	type: 'dialog',
+});
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/users/current-user/modals/change-password/change-password-modal.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/users/current-user/modals/change-password/change-password-modal.element.ts
index eb8830b5a0..f79414cb2d 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/users/current-user/modals/change-password/change-password-modal.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/users/current-user/modals/change-password/change-password-modal.element.ts
@@ -1,7 +1,7 @@
 import { UUITextStyles } from '@umbraco-ui/uui-css/lib';
 import { css, CSSResultGroup, html, nothing } from 'lit';
 import { customElement, property } from 'lit/decorators.js';
-import { UmbChangePasswordModalData } from '.';
+import { UmbChangePasswordModalData } from '../../../../../../libs/modal/token';
 import { UmbModalHandler } from '@umbraco-cms/backoffice/modal';
 import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
 
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/users/current-user/modals/change-password/index.ts b/src/Umbraco.Web.UI.Client/src/backoffice/users/current-user/modals/change-password/index.ts
deleted file mode 100644
index 686021241b..0000000000
--- a/src/Umbraco.Web.UI.Client/src/backoffice/users/current-user/modals/change-password/index.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { UmbModalToken } from '@umbraco-cms/backoffice/modal';
-
-export interface UmbChangePasswordModalData {
-	requireOldPassword: boolean;
-}
-
-export const UMB_CHANGE_PASSWORD_MODAL_TOKEN = new UmbModalToken<UmbChangePasswordModalData>(
-	'Umb.Modal.ChangePassword',
-	{
-		type: 'dialog',
-	}
-);
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/users/current-user/modals/current-user/current-user-modal.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/users/current-user/modals/current-user/current-user-modal.element.ts
index 959687fd9c..b987dae615 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/users/current-user/modals/current-user/current-user-modal.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/users/current-user/modals/current-user/current-user-modal.element.ts
@@ -7,7 +7,7 @@ import {
 	UMB_CURRENT_USER_HISTORY_STORE_CONTEXT_TOKEN,
 } from '../../current-user-history.store';
 import { UmbCurrentUserStore, UMB_CURRENT_USER_STORE_CONTEXT_TOKEN } from '../../current-user.store';
-import { UMB_CHANGE_PASSWORD_MODAL_TOKEN } from '../change-password';
+import { UMB_CHANGE_PASSWORD_MODAL } from '../../../../../../libs/modal/token';
 import { UmbModalHandler, UmbModalContext, UMB_MODAL_CONTEXT_TOKEN } from '@umbraco-cms/backoffice/modal';
 import type { UserDetails } from '@umbraco-cms/backoffice/models';
 import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
@@ -139,7 +139,7 @@ export class UmbCurrentUserModalElement extends UmbLitElement {
 	private _changePassword() {
 		if (!this._modalContext) return;
 
-		this._modalContext.open(UMB_CHANGE_PASSWORD_MODAL_TOKEN, {
+		this._modalContext.open(UMB_CHANGE_PASSWORD_MODAL, {
 			requireOldPassword: this._currentUserStore?.isAdmin || false,
 		});
 	}
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/users/users/workspace/user-workspace-edit.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/users/users/workspace/user-workspace-edit.element.ts
index 67f89f7402..944a54f750 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/users/users/workspace/user-workspace-edit.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/users/users/workspace/user-workspace-edit.element.ts
@@ -6,7 +6,7 @@ import { ifDefined } from 'lit/directives/if-defined.js';
 import { repeat } from 'lit/directives/repeat.js';
 
 import { UmbCurrentUserStore, UMB_CURRENT_USER_STORE_CONTEXT_TOKEN } from '../../current-user/current-user.store';
-import { UMB_CHANGE_PASSWORD_MODAL_TOKEN } from '../../current-user/modals/change-password';
+import { UMB_CHANGE_PASSWORD_MODAL } from '../../../../../libs/modal/token';
 import { UmbUserWorkspaceContext } from './user-workspace.context';
 import type { UmbModalContext } from '@umbraco-cms/backoffice/modal';
 import { getLookAndColorFromUserStatus } from '@umbraco-cms/backoffice/utils';
@@ -181,7 +181,7 @@ export class UmbUserWorkspaceEditElement extends UmbLitElement {
 	}
 
 	private _changePassword() {
-		this._modalContext?.open(UMB_CHANGE_PASSWORD_MODAL_TOKEN, {
+		this._modalContext?.open(UMB_CHANGE_PASSWORD_MODAL, {
 			requireOldPassword: this._currentUserStore?.isAdmin === false,
 		});
 	}