diff --git a/app/routes/machines/components/machine-row.tsx b/app/routes/machines/components/machine-row.tsx
index f1860e0..c078773 100644
--- a/app/routes/machines/components/machine-row.tsx
+++ b/app/routes/machines/components/machine-row.tsx
@@ -64,7 +64,7 @@ export default function MachineRow({
 						{node.givenName}
 					</p>
 					<p className="text-sm opacity-50">
-						{node.user.name || node.user.email}
+						{node.user.name || node.user.email || node.user.id}
 					</p>
 					<div className="flex gap-1 flex-wrap mt-1.5">
 						{mapTagsToComponents(node, uiTags)}
diff --git a/app/routes/machines/dialogs/move.tsx b/app/routes/machines/dialogs/move.tsx
index aa73022..305a358 100644
--- a/app/routes/machines/dialogs/move.tsx
+++ b/app/routes/machines/dialogs/move.tsx
@@ -34,7 +34,7 @@ export default function Move({ machine, users, isOpen, setIsOpen }: MoveProps) {
 					}}
 				>
 					{users.map((user) => (
-						<Select.Item key={user.id}>{user.name}</Select.Item>
+					    <Select.Item key={user.id}>{user.name || user.email || user.id}</Select.Item>
 					))}
 				</Select>
 			</Dialog.Panel>
diff --git a/app/routes/machines/dialogs/new.tsx b/app/routes/machines/dialogs/new.tsx
index 1377eb2..35c6320 100644
--- a/app/routes/machines/dialogs/new.tsx
+++ b/app/routes/machines/dialogs/new.tsx
@@ -46,7 +46,7 @@ export default function NewMachine(data: NewMachineProps) {
 						placeholder="Select a user"
 					>
 						{data.users.map((user) => (
-							<Select.Item key={user.id}>{user.name}</Select.Item>
+						    <Select.Item key={user.id}>{user.name || user.email || user.id}</Select.Item>
 						))}
 					</Select>
 				</Dialog.Panel>
diff --git a/app/routes/machines/machine.tsx b/app/routes/machines/machine.tsx
index 7f24cd6..a081085 100644
--- a/app/routes/machines/machine.tsx
+++ b/app/routes/machines/machine.tsx
@@ -109,7 +109,7 @@ export default function Page() {
 					</span>
 					<div className="flex items-center gap-x-2.5 mt-1">
 						<UserCircle />
-						{node.user.name || node.user.email}
+						{node.user.name || node.user.email || node.user.id}
 					</div>
 				</div>
 				<div className="p-2 pl-4">
diff --git a/app/routes/settings/auth-keys/dialogs/add-auth-key.tsx b/app/routes/settings/auth-keys/dialogs/add-auth-key.tsx
index 43ac1b7..faa3753 100644
--- a/app/routes/settings/auth-keys/dialogs/add-auth-key.tsx
+++ b/app/routes/settings/auth-keys/dialogs/add-auth-key.tsx
@@ -36,7 +36,7 @@ export default function AddAuthKey(data: AddAuthKeyProps) {
 					}}
 				>
 					{data.users.map((user) => (
-						<Select.Item key={user.id}>{user.name}</Select.Item>
+					    <Select.Item key={user.id}>{user.name || user.email || user.id}</Select.Item>
 					))}
 				</Select>
 				<NumberInput
diff --git a/app/routes/settings/auth-keys/overview.tsx b/app/routes/settings/auth-keys/overview.tsx
index a2457e7..ef2cdfa 100644
--- a/app/routes/settings/auth-keys/overview.tsx
+++ b/app/routes/settings/auth-keys/overview.tsx
@@ -197,7 +197,7 @@ export default function Page() {
 					{[
 						<Select.Item key="__headplane_all">All</Select.Item>,
 						...keys.map(({ user }) => (
-							<Select.Item key={user.id}>{user.name}</Select.Item>
+							<Select.Item key={user.id}>{user.name || user.email || user.id}</Select.Item>
 						)),
 					]}
 				</Select>
diff --git a/app/routes/users/dialogs/delete-user.tsx b/app/routes/users/dialogs/delete-user.tsx
index 1575d7f..0e2aae2 100644
--- a/app/routes/users/dialogs/delete-user.tsx
+++ b/app/routes/users/dialogs/delete-user.tsx
@@ -8,8 +8,7 @@ interface DeleteProps {
 }
 
 export default function DeleteUser({ user, isOpen, setIsOpen }: DeleteProps) {
-	const name =
-		(user.displayName?.length ?? 0) > 0 ? user.displayName : user.name;
+	const name = user.name;
 
 	return (
 		<Dialog isOpen={isOpen} onOpenChange={setIsOpen}>
diff --git a/app/utils/oidc.ts b/app/utils/oidc.ts
index 788029c..113bb09 100644
--- a/app/utils/oidc.ts
+++ b/app/utils/oidc.ts
@@ -132,6 +132,10 @@ function getName(user: client.UserInfoResponse, claims: client.IDToken) {
 		return user.name;
 	}
 
+	if (user.displayName) {
+		return user.displayName;
+	}
+
 	if (claims.name && typeof claims.name === 'string') {
 		return claims.name;
 	}