diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/modals/change-password/change-password-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/user/change-password/change-password-modal.element.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/user/modals/change-password/change-password-modal.element.ts
rename to src/Umbraco.Web.UI.Client/src/packages/user/change-password/change-password-modal.element.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/entity-actions/change-password/change-user-password.action.ts b/src/Umbraco.Web.UI.Client/src/packages/user/change-password/change-user-password.action.ts
similarity index 95%
rename from src/Umbraco.Web.UI.Client/src/packages/user/user/entity-actions/change-password/change-user-password.action.ts
rename to src/Umbraco.Web.UI.Client/src/packages/user/change-password/change-user-password.action.ts
index 0b31df09d0..fbf0e35929 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/user/user/entity-actions/change-password/change-user-password.action.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/user/change-password/change-user-password.action.ts
@@ -1,4 +1,4 @@
-import { UmbChangeUserPasswordRepository } from '../../repository/index.js';
+import { UmbChangeUserPasswordRepository } from '@umbraco-cms/backoffice/user';
 import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
 import type { UmbEntityActionArgs } from '@umbraco-cms/backoffice/entity-action';
 import { UmbEntityActionBase } from '@umbraco-cms/backoffice/entity-action';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/change-password/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/user/change-password/manifests.ts
new file mode 100644
index 0000000000..083dc29663
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/packages/user/change-password/manifests.ts
@@ -0,0 +1,24 @@
+import type { ManifestTypes, UmbBackofficeManifestKind } from '@umbraco-cms/backoffice/extension-registry';
+import { UMB_USER_ENTITY_TYPE } from '@umbraco-cms/backoffice/user';
+
+export const manifests: Array<ManifestTypes | UmbBackofficeManifestKind> = [
+	{
+		type: 'entityAction',
+		kind: 'default',
+		alias: 'Umb.EntityAction.User.ChangePassword',
+		name: 'Change User Password Entity Action',
+		weight: 600,
+		api: () => import('./change-user-password.action.js'),
+		forEntityTypes: [UMB_USER_ENTITY_TYPE],
+		meta: {
+			icon: 'icon-key',
+			label: '#user_changePassword',
+		},
+	},
+	{
+		type: 'modal',
+		alias: 'Umb.Modal.ChangePassword',
+		name: 'Change Password Modal',
+		js: () => import('./change-password-modal.element.js'),
+	},
+];
diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/user/manifests.ts
index 16faa5c71d..96353d28f7 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/user/manifests.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/user/manifests.ts
@@ -3,7 +3,7 @@ import { manifests as userManifests } from './user/manifests.js';
 import { manifests as userSectionManifests } from './user-section/manifests.js';
 import { manifests as currentUserManifests } from './current-user/manifests.js';
 import { manifests as userPermissionManifests } from './user-permission/manifests.js';
-import { manifests as modalManifests } from './modals/manifests.js';
+import { manifests as changePasswordManifests } from './change-password/manifests.js';
 
 // We need to load any components that are not loaded by the user management bundle to register them in the browser.
 import './user-group/components/index.js';
@@ -16,5 +16,5 @@ export const manifests = [
 	...userSectionManifests,
 	...currentUserManifests,
 	...userPermissionManifests,
-	...modalManifests,
+	...changePasswordManifests,
 ];
diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/modals/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/user/modals/manifests.ts
deleted file mode 100644
index 8c373a336e..0000000000
--- a/src/Umbraco.Web.UI.Client/src/packages/user/modals/manifests.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import type { ManifestModal, ManifestTypes } from '@umbraco-cms/backoffice/extension-registry';
-
-const modals: Array<ManifestModal> = [
-	{
-		type: 'modal',
-		alias: 'Umb.Modal.ChangePassword',
-		name: 'Change Password Modal',
-		js: () => import('./change-password/change-password-modal.element.js'),
-	},
-];
-
-export const manifests: Array<ManifestTypes> = [...modals];
diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/entity-actions/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/entity-actions/manifests.ts
index 8e26c3c2f1..b67955449e 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/user/user/entity-actions/manifests.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/entity-actions/manifests.ts
@@ -55,19 +55,6 @@ const entityActions: Array<ManifestTypes> = [
 			},
 		],
 	},
-	{
-		type: 'entityAction',
-		kind: 'default',
-		alias: 'Umb.EntityAction.User.ChangePassword',
-		name: 'Change User Password Entity Action',
-		weight: 600,
-		api: () => import('./change-password/change-user-password.action.js'),
-		forEntityTypes: [UMB_USER_ENTITY_TYPE],
-		meta: {
-			icon: 'icon-key',
-			label: '#user_changePassword',
-		},
-	},
 	{
 		type: 'entityAction',
 		kind: 'default',