diff --git a/app/routes/settings/auth-keys.tsx b/app/routes/settings/auth-keys.tsx
index 3829273..bb9cf1b 100644
--- a/app/routes/settings/auth-keys.tsx
+++ b/app/routes/settings/auth-keys.tsx
@@ -26,10 +26,17 @@ export async function loader({ request }: LoaderFunctionArgs) {
 			const qp = new URLSearchParams();
 			qp.set('user', user.name);
 
-			return pull<{ preAuthKeys: PreAuthKey[] }>(
+			var result =  pull<{ preAuthKeys: PreAuthKey[] }>(
 				`v1/preauthkey?${qp.toString()}`,
 				session.get('hsApiKey')!,
 			);
+			
+			// Change the email returned by Headscale API to username
+		        result.forEach((preauthkey_item, index) => {
+			    preauthkey_item.user = user;
+			});
+			
+			return result;
 		}),
 	);