diff --git a/app/components/Header.tsx b/app/components/Header.tsx
index f02d6e3..e166c7f 100644
--- a/app/components/Header.tsx
+++ b/app/components/Header.tsx
@@ -107,7 +107,7 @@ export default function Header(data: Props) {
 								{data.user.picture ? (
 									<img
 										src={data.user.picture}
-										alt={data.user.name}
+										alt={data.user.name || data.user.displayName}
 										className="w-8 h-8 rounded-full"
 									/>
 								) : (
@@ -131,7 +131,7 @@ export default function Header(data: Props) {
 								<Menu.Section>
 									<Menu.Item key="profile" textValue="Profile">
 										<div className="text-black dark:text-headplane-50">
-											<p className="font-bold">{data.user.name}</p>
+											<p className="font-bold">{data.user.name || data.user.displayName}</p>
 											<p>{data.user.email}</p>
 										</div>
 									</Menu.Item>
diff --git a/app/routes/machines/components/machine-row.tsx b/app/routes/machines/components/machine-row.tsx
index 9bae776..0aa662e 100644
--- a/app/routes/machines/components/machine-row.tsx
+++ b/app/routes/machines/components/machine-row.tsx
@@ -65,7 +65,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.displayName || 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..3b86bb7 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.displayName || 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..df98129 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.displayName || user.email || user.id}</Select.Item>
 						))}
 					</Select>
 				</Dialog.Panel>
diff --git a/app/routes/machines/machine.tsx b/app/routes/machines/machine.tsx
index 5b8bcaa..660e9f4 100644
--- a/app/routes/machines/machine.tsx
+++ b/app/routes/machines/machine.tsx
@@ -108,7 +108,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.displayName || node.user.email || node.user.id}
 					</div>
 				</div>
 				<div className="p-2 pl-4">
@@ -253,7 +253,7 @@ export default function Page() {
 				variant="flat"
 			>
 				<div className="flex flex-col gap-1">
-					<Attribute name="Creator" value={node.user.name || node.user.email} />
+					<Attribute name="Creator" value={node.user.name || node.user.displayName || node.user.email || node.user.id} />
 					<Attribute name="Machine name" value={node.givenName} />
 					<Attribute
 						name="OS hostname"
diff --git a/app/routes/settings/auth-keys/auth-key-row.tsx b/app/routes/settings/auth-keys/auth-key-row.tsx
index 5483f76..76f422d 100644
--- a/app/routes/settings/auth-keys/auth-key-row.tsx
+++ b/app/routes/settings/auth-keys/auth-key-row.tsx
@@ -18,7 +18,7 @@ export default function AuthKeyRow({ authKey, user, url }: Props) {
 	return (
 		<div className="w-full">
 			<Attribute name="Key" value={authKey.key} isCopyable />
-			<Attribute name="User" value={user.name} isCopyable />
+			<Attribute name="User" value={user.name || user.displayName} isCopyable />
 			<Attribute name="Reusable" value={authKey.reusable ? 'Yes' : 'No'} />
 			<Attribute name="Ephemeral" value={authKey.ephemeral ? 'Yes' : 'No'} />
 			<Attribute name="Used" value={authKey.used ? 'Yes' : 'No'} />
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..18df724 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.displayName || 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 9f328e2..408b246 100644
--- a/app/routes/settings/auth-keys/overview.tsx
+++ b/app/routes/settings/auth-keys/overview.tsx
@@ -198,7 +198,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.displayName || user.email || user.id}</Select.Item>
 						)),
 					]}
 				</Select>
diff --git a/app/routes/users/components/user-row.tsx b/app/routes/users/components/user-row.tsx
index b6d9118..ce8d531 100644
--- a/app/routes/users/components/user-row.tsx
+++ b/app/routes/users/components/user-row.tsx
@@ -26,14 +26,14 @@ export default function UserRow({ user, role }: UserRowProps) {
 					{user.profilePicUrl ? (
 						<img
 							src={user.profilePicUrl}
-							alt={user.name}
+							alt={user.name || user.displayName}
 							className="w-10 h-10 rounded-full"
 						/>
 					) : (
 						<CircleUser className="w-10 h-10" />
 					)}
 					<div className="ml-4">
-						<p className={cn('font-semibold leading-snug')}>{user.name}</p>
+						<p className={cn('font-semibold leading-snug')}>{user.name || user.displayName}</p>
 						<p className="text-sm opacity-50">{user.email}</p>
 					</div>
 				</div>
diff --git a/app/routes/users/dialogs/delete-user.tsx b/app/routes/users/dialogs/delete-user.tsx
index 1575d7f..2490adb 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 || user.displayName;
 
 	return (
 		<Dialog isOpen={isOpen} onOpenChange={setIsOpen}>
diff --git a/app/routes/users/dialogs/reassign-user.tsx b/app/routes/users/dialogs/reassign-user.tsx
index d31fdcc..ab88195 100644
--- a/app/routes/users/dialogs/reassign-user.tsx
+++ b/app/routes/users/dialogs/reassign-user.tsx
@@ -21,7 +21,7 @@ export default function ReassignUser({
 			<Dialog.Panel
 				variant={user.headplaneRole === 'owner' ? 'unactionable' : 'normal'}
 			>
-				<Dialog.Title>Change role for {user.name}?</Dialog.Title>
+				<Dialog.Title>Change role for {user.name || user.displayName}?</Dialog.Title>
 				<Dialog.Text className="mb-6">
 					Most roles are carried straight from Tailscale. However, keep in mind
 					that I have not fully implemented permissions yet and some things may
diff --git a/app/routes/users/dialogs/rename-user.tsx b/app/routes/users/dialogs/rename-user.tsx
index a18b830..b47245b 100644
--- a/app/routes/users/dialogs/rename-user.tsx
+++ b/app/routes/users/dialogs/rename-user.tsx
@@ -13,9 +13,9 @@ export default function RenameUser({ user, isOpen, setIsOpen }: RenameProps) {
 	return (
 		<Dialog isOpen={isOpen} onOpenChange={setIsOpen}>
 			<Dialog.Panel>
-				<Dialog.Title>Rename {user.name}?</Dialog.Title>
+				<Dialog.Title>Rename {user.name || user.displayName}?</Dialog.Title>
 				<Dialog.Text className="mb-6">
-					Enter a new username for {user.name}. Changing a username will not
+					Enter a new username for {user.name || user.displayName}. Changing a username will not
 					update any ACL policies that may refer to this user by their old
 					username.
 				</Dialog.Text>
diff --git a/flake.lock b/flake.lock
index 7e929b4..bd8b121 100644
--- a/flake.lock
+++ b/flake.lock
@@ -40,11 +40,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1750386251,
-        "narHash": "sha256-1ovgdmuDYVo5OUC5NzdF+V4zx2uT8RtsgZahxidBTyw=",
+        "lastModified": 1755268003,
+        "narHash": "sha256-nNaeJjo861wFR0tjHDyCnHs1rbRtrMgxAKMoig9Sj/w=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "076e8c6678d8c54204abcb4b1b14c366835a58bb",
+        "rev": "32f313e49e42f715491e1ea7b306a87c16fe0388",
         "type": "github"
       },
       "original": {
diff --git a/nix/package.nix b/nix/package.nix
index fab5964..73bfa2e 100644
--- a/nix/package.nix
+++ b/nix/package.nix
@@ -26,11 +26,11 @@ in
 
     dontCheckForBrokenSymlinks = true;
 
-    pnpmDeps = pnpm_10.fetchDeps {
-      inherit pname version src;
-      fetcherVersion = 2;
-      hash = "sha256-drsQWU1/cDcbJ75CerXQSYFNNAOgaX6rFn6wRom8fiU=";
-    };
+  pnpmDeps = pnpm_10.fetchDeps {
+    inherit (finalAttrs) pname version src;
+    hash = "sha256-xjjkqbgjYaAGYAmlTFE+Lq3Hp6myZKaW3br0YTDNhQA=";
+	fetcherVersion = 1;
+  };
 
     buildPhase = ''
       runHook preBuild