diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/entity-actions/create/index.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/entity-actions/create/index.ts
new file mode 100644
index 0000000000..28d9f38fba
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/entity-actions/create/index.ts
@@ -0,0 +1 @@
+export * from './modal/index.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/entity-actions/create/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/entity-actions/create/manifests.ts
index 2e67f026d0..095b44610b 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/user/user/entity-actions/create/manifests.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/entity-actions/create/manifests.ts
@@ -1,6 +1,7 @@
 import { UMB_USER_ROOT_ENTITY_TYPE } from '../../entity.js';
 import { manifests as apiUser } from './api-user/manifests.js';
 import { manifests as defaultUser } from './default-user/manifests.js';
+import { manifests as modalManifests } from './modal/manifests.js';
 
 import type { UmbExtensionManifestKind } from '@umbraco-cms/backoffice/extension-registry';
 
@@ -14,4 +15,5 @@ export const manifests: Array<UmbExtensionManifest | UmbExtensionManifestKind> =
 	},
 	...apiUser,
 	...defaultUser,
+	...modalManifests,
 ];
diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/modals/create/constants.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/entity-actions/create/modal/constants.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/user/user/modals/create/constants.ts
rename to src/Umbraco.Web.UI.Client/src/packages/user/user/entity-actions/create/modal/constants.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/modals/create/create-user-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/entity-actions/create/modal/create-user-modal.element.ts
similarity index 97%
rename from src/Umbraco.Web.UI.Client/src/packages/user/user/modals/create/create-user-modal.element.ts
rename to src/Umbraco.Web.UI.Client/src/packages/user/user/entity-actions/create/modal/create-user-modal.element.ts
index 863fc88bec..cea24184d8 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/user/user/modals/create/create-user-modal.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/entity-actions/create/modal/create-user-modal.element.ts
@@ -1,5 +1,5 @@
-import { UmbUserDetailRepository } from '../../repository/index.js';
-import { UmbUserKind } from '../../utils/index.js';
+import { UmbUserDetailRepository } from '../../../repository/index.js';
+import { UmbUserKind } from '../../../utils/index.js';
 import { UMB_CREATE_USER_SUCCESS_MODAL } from './create-user-success-modal.token.js';
 import type { UmbCreateUserModalData } from './create-user-modal.token.js';
 import type { UmbUserGroupInputElement } from '@umbraco-cms/backoffice/user-group';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/modals/create/create-user-modal.token.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/entity-actions/create/modal/create-user-modal.token.ts
similarity index 85%
rename from src/Umbraco.Web.UI.Client/src/packages/user/user/modals/create/create-user-modal.token.ts
rename to src/Umbraco.Web.UI.Client/src/packages/user/user/entity-actions/create/modal/create-user-modal.token.ts
index 4486b12f4f..3fb7a19847 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/user/user/modals/create/create-user-modal.token.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/entity-actions/create/modal/create-user-modal.token.ts
@@ -1,4 +1,4 @@
-import type { UmbUserKindType } from '../../utils/index.js';
+import type { UmbUserKindType } from '../../../utils/index.js';
 import { UMB_CREATE_USER_MODAL_ALIAS } from './constants.js';
 import { UmbModalToken } from '@umbraco-cms/backoffice/modal';
 
diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/modals/create/create-user-success-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/entity-actions/create/modal/create-user-success-modal.element.ts
similarity index 92%
rename from src/Umbraco.Web.UI.Client/src/packages/user/user/modals/create/create-user-success-modal.element.ts
rename to src/Umbraco.Web.UI.Client/src/packages/user/user/entity-actions/create/modal/create-user-success-modal.element.ts
index f30bf145be..d3c43c0a0d 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/user/user/modals/create/create-user-success-modal.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/entity-actions/create/modal/create-user-success-modal.element.ts
@@ -1,7 +1,7 @@
-import { UmbUserItemRepository } from '../../repository/item/index.js';
-import { UmbNewUserPasswordRepository } from '../../repository/new-password/index.js';
-import type { UmbUserItemModel } from '../../repository/item/types.js';
-import { UMB_USER_WORKSPACE_PATH } from '../../paths.js';
+import { UmbUserItemRepository } from '../../../repository/item/index.js';
+import { UmbNewUserPasswordRepository } from '../../../repository/new-password/index.js';
+import type { UmbUserItemModel } from '../../../repository/item/index.js';
+import { UMB_USER_WORKSPACE_PATH } from '../../../paths.js';
 import type {
 	UmbCreateUserSuccessModalData,
 	UmbCreateUserSuccessModalValue,
diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/modals/create/create-user-success-modal.token.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/entity-actions/create/modal/create-user-success-modal.token.ts
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/packages/user/user/modals/create/create-user-success-modal.token.ts
rename to src/Umbraco.Web.UI.Client/src/packages/user/user/entity-actions/create/modal/create-user-success-modal.token.ts
diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/entity-actions/create/modal/index.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/entity-actions/create/modal/index.ts
new file mode 100644
index 0000000000..4f07201dcf
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/entity-actions/create/modal/index.ts
@@ -0,0 +1 @@
+export * from './constants.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/entity-actions/create/modal/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/entity-actions/create/modal/manifests.ts
new file mode 100644
index 0000000000..ca86e33e91
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/entity-actions/create/modal/manifests.ts
@@ -0,0 +1,16 @@
+import { UMB_CREATE_USER_MODAL_ALIAS } from './constants.js';
+
+export const manifests: Array<UmbExtensionManifest> = [
+	{
+		type: 'modal',
+		alias: UMB_CREATE_USER_MODAL_ALIAS,
+		name: 'Create User Modal',
+		js: () => import('./create-user-modal.element.js'),
+	},
+	{
+		type: 'modal',
+		alias: 'Umb.Modal.User.CreateSuccess',
+		name: 'Create Success User Modal',
+		js: () => import('./create-user-success-modal.element.js'),
+	},
+];
diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/entity-actions/create/user-entity-create-option-action-base.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/entity-actions/create/user-entity-create-option-action-base.ts
index ea74db1f15..ca55652d5a 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/user/user/entity-actions/create/user-entity-create-option-action-base.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/entity-actions/create/user-entity-create-option-action-base.ts
@@ -1,5 +1,5 @@
-import { UMB_CREATE_USER_MODAL } from '../../modals/create/create-user-modal.token.js';
 import type { UmbUserKindType } from '../../utils/index.js';
+import { UMB_CREATE_USER_MODAL } from './modal/create-user-modal.token.js';
 import { UMB_ACTION_EVENT_CONTEXT } from '@umbraco-cms/backoffice/action';
 import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
 import { UmbRequestReloadChildrenOfEntityEvent } from '@umbraco-cms/backoffice/entity-action';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/modals/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/modals/manifests.ts
index 614f3e0d7b..03273e88df 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/user/user/modals/manifests.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/modals/manifests.ts
@@ -1,18 +1,4 @@
-import { UMB_CREATE_USER_MODAL_ALIAS } from './create/constants.js';
-
 export const manifests: Array<UmbExtensionManifest> = [
-	{
-		type: 'modal',
-		alias: UMB_CREATE_USER_MODAL_ALIAS,
-		name: 'Create User Modal',
-		js: () => import('./create/create-user-modal.element.js'),
-	},
-	{
-		type: 'modal',
-		alias: 'Umb.Modal.User.CreateSuccess',
-		name: 'Create Success User Modal',
-		js: () => import('./create/create-user-success-modal.element.js'),
-	},
 	{
 		type: 'modal',
 		alias: 'Umb.Modal.User.Picker',