diff --git a/frontend/src/lib/components/CenteredModal.svelte b/frontend/src/lib/components/CenteredModal.svelte
index 3548a20a8f..4380177888 100644
--- a/frontend/src/lib/components/CenteredModal.svelte
+++ b/frontend/src/lib/components/CenteredModal.svelte
@@ -1,20 +1,17 @@
 <script lang="ts">
 	import { setLicense } from '$lib/enterpriseUtils'
-	import { enterpriseLicense } from '$lib/stores'
+	import { enterpriseLicense, whitelabelNameStore } from '$lib/stores'
 	import WindmillIcon from './icons/WindmillIcon.svelte'
 	import LoginPageHeader from './LoginPageHeader.svelte'
 
-	export let subtitle: string | undefined = undefined
-	export let title = 'Windmill'
-	export let disableLogo = false
-	export let large = false
+	let { subtitle, title, disableLogo, large } = $props()
 
 	setLicense()
 </script>
 
 <div class="center-center min-h-screen p-4 relative bg-surface-secondary">
 	<div class="flex flex-col gap-2 items-center w-full">
-		{#if (!disableLogo && !$enterpriseLicense) || !$enterpriseLicense?.endsWith('_whitelabel')}
+		{#if (!disableLogo && !$enterpriseLicense) || !$whitelabelNameStore}
 			<div class="hidden lg:block">
 				<div>
 					<WindmillIcon height="100px" width="100px" spin="slow" />
diff --git a/frontend/src/lib/stores.ts b/frontend/src/lib/stores.ts
index 9a126bf080..f6d2e42685 100644
--- a/frontend/src/lib/stores.ts
+++ b/frontend/src/lib/stores.ts
@@ -50,6 +50,12 @@ export const tutorialsToDo = writable<number[]>([])
 export const globalEmailInvite = writable<string>('')
 export const awarenessStore = writable<Record<string, string>>(undefined)
 export const enterpriseLicense = writable<string | undefined>(undefined)
+export const whitelabelNameStore = derived([enterpriseLicense], ([enterpriseLicense]) => {
+	if (enterpriseLicense?.endsWith('__whitelabel')) {
+		return enterpriseLicense.split('__whitelabel')[0]
+	}
+	return undefined
+})
 export const workerTags = writable<string[] | undefined>(undefined)
 export const usageStore = writable<number>(0)
 export const workspaceUsageStore = writable<number>(0)
diff --git a/frontend/src/routes/(root)/(logged)/+layout.svelte b/frontend/src/routes/(root)/(logged)/+layout.svelte
index fe46d90921..dc3876ffc5 100644
--- a/frontend/src/routes/(root)/(logged)/+layout.svelte
+++ b/frontend/src/routes/(root)/(logged)/+layout.svelte
@@ -11,7 +11,7 @@
 		UserService,
 		WorkspaceService
 	} from '$lib/gen'
-	import { classNames, getModifierKey } from '$lib/utils'
+	import { capitalize, classNames, getModifierKey } from '$lib/utils'
 	import WorkspaceMenu from '$lib/components/sidebar/WorkspaceMenu.svelte'
 	import SidebarContent from '$lib/components/sidebar/SidebarContent.svelte'
 	import CriticalAlertModal from '$lib/components/sidebar/CriticalAlertModal.svelte'
@@ -29,7 +29,8 @@
 		hubBaseUrlStore,
 		usedTriggerKinds,
 		devopsRole,
-		setCopilotInfo
+		setCopilotInfo,
+		whitelabelNameStore
 	} from '$lib/stores'
 	import CenteredModal from '$lib/components/CenteredModal.svelte'
 	import { afterNavigate, beforeNavigate } from '$app/navigation'
@@ -428,7 +429,11 @@
 								<div class="dark:bg-[#1e232e] bg-[#202125] h-full !dark flex flex-col">
 									<div class="flex gap-x-2 flex-shrink-0 p-4 font-semibold text-gray-200 w-40">
 										<WindmillIcon white={true} height="20px" width="20px" />
-										Windmill
+										{#if $whitelabelNameStore}
+											{$whitelabelNameStore}
+										{:else}
+											Windmill
+										{/if}
 									</div>
 									<div class="px-2 py-4 border-y border-gray-500">
 										<Menubar let:createMenu>
@@ -481,7 +486,11 @@
 										<WindmillIcon white={true} height="20px" width="20px" />
 									</div>
 									{#if !isCollapsed}
-										<div class="text-sm mt-0.5 text-white"> Windmill </div>
+										<div class="text-sm mt-0.5 text-white">
+											{#if $whitelabelNameStore}{capitalize(
+													$whitelabelNameStore
+												)}{:else}Windmill{/if}
+										</div>
 									{/if}
 								</div>
 							</button>
@@ -579,7 +588,9 @@
 								class:w-40={!isCollapsed}
 							>
 								<WindmillIcon white={true} height="20px" width="20px" />
-								{#if !isCollapsed}Windmill{/if}
+								{#if !isCollapsed}{#if $whitelabelNameStore}{capitalize(
+											$whitelabelNameStore
+										)}{:else}Windmill{/if}{/if}
 							</div>
 
 							<div class="px-2 py-4 space-y-2 border-y border-gray-500">
diff --git a/frontend/src/routes/(root)/(logged)/user/(user)/login/+page.svelte b/frontend/src/routes/(root)/(logged)/user/(user)/login/+page.svelte
index 794c22e48e..27f37b90bb 100644
--- a/frontend/src/routes/(root)/(logged)/user/(user)/login/+page.svelte
+++ b/frontend/src/routes/(root)/(logged)/user/(user)/login/+page.svelte
@@ -3,7 +3,13 @@
 	import { page } from '$app/stores'
 
 	import { UserService, WorkspaceService } from '$lib/gen'
-	import { usersWorkspaceStore, workspaceStore, userStore, enterpriseLicense } from '$lib/stores'
+	import {
+		usersWorkspaceStore,
+		workspaceStore,
+		userStore,
+		enterpriseLicense,
+		whitelabelNameStore
+	} from '$lib/stores'
 	import { classNames, emptyString, parseQueryParams } from '$lib/utils'
 	import { getUserExt } from '$lib/user'
 	import { WindmillIcon } from '$lib/components/icons'
@@ -115,7 +121,7 @@
 	<LoginPageHeader />
 	<div class="sm:mx-auto sm:w-full sm:max-w-md">
 		<div class="mx-auto flex justify-center">
-			{#if !$enterpriseLicense || !$enterpriseLicense?.endsWith('_whitelabel')}
+			{#if !$enterpriseLicense || !$whitelabelNameStore}
 				<WindmillIcon height="80px" width="80px" spin="slow" />
 			{/if}
 		</div>