diff --git a/src/Umbraco.Web.UI.Client/src/apps/app/app.element.ts b/src/Umbraco.Web.UI.Client/src/apps/app/app.element.ts
index 2e87197430..73cc0199d7 100644
--- a/src/Umbraco.Web.UI.Client/src/apps/app/app.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/apps/app/app.element.ts
@@ -27,7 +27,7 @@ export class UmbAppElement extends UmbLitElement {
 	 * @remarks This is the base URL of the Umbraco server, not the base URL of the backoffice.
 	 */
 	@property({ type: String })
-	serverUrl = '';
+	serverUrl = window.location.origin;
 
 	/**
 	 * The base path of the backoffice.
diff --git a/src/Umbraco.Web.UI.Client/src/packages/users/user-groups/components/input-user-group/user-group-input.stories.ts b/src/Umbraco.Web.UI.Client/src/packages/users/user-groups/components/input-user-group/user-group-input.stories.ts
index 16c93e313c..7183422f23 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/users/user-groups/components/input-user-group/user-group-input.stories.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/users/user-groups/components/input-user-group/user-group-input.stories.ts
@@ -1,10 +1,10 @@
 import { Meta, StoryObj } from '@storybook/web-components';
-import './input-user-group.element';
 import type { UmbUserGroupInputElement } from './user-group-input.element';
+import './user-group-input.element';
 
 const meta: Meta<UmbUserGroupInputElement> = {
-	title: 'Components/Inputs/User Group',
-	component: 'umb-input-user-group',
+	title: 'User Group/Components/User Group Input',
+	component: 'umb-user-group-input',
 	argTypes: {
 		// modalType: {
 		// 	control: 'inline-radio',
diff --git a/src/Umbraco.Web.UI.Client/vite.cms.config.ts b/src/Umbraco.Web.UI.Client/vite.cms.config.ts
index a2ac17fd86..295082be08 100644
--- a/src/Umbraco.Web.UI.Client/vite.cms.config.ts
+++ b/src/Umbraco.Web.UI.Client/vite.cms.config.ts
@@ -6,7 +6,7 @@ import { plugins } from './vite.config';
 export default defineConfig({
 	build: {
 		lib: {
-			entry: 'src/app.ts',
+			entry: 'src/apps/app/app.element.ts',
 			formats: ['es'],
 			fileName: 'main',
 		},