diff --git a/apps/desktop/src/main.tsx b/apps/desktop/src/main.tsx
index 13e4cb4..7b062d4 100644
--- a/apps/desktop/src/main.tsx
+++ b/apps/desktop/src/main.tsx
@@ -408,8 +408,8 @@ function App() {
         provisioningCode: storedCode,
         hostname: machineProfile.hostname,
         os: machineProfile.os,
-        macAddresses: machineProfile.mac_addresses,
-        serialNumbers: machineProfile.serial_numbers,
+        macAddresses: machineProfile.macAddresses,
+        serialNumbers: machineProfile.serialNumbers,
         metadata: metadataPayload,
         collaborator: {
           email: collaboratorEmail,
@@ -898,7 +898,7 @@ useEffect(() => {
           body: JSON.stringify({ machineToken: data.machineToken, rememberMe: true }),
         })
       } catch {}
-      const persona = (cfg.accessRole ?? "collaborator") === "manager" ? "manager" : "collaborator"
+      const persona = (data.persona ?? "collaborator").toLowerCase() === "manager" ? "manager" : "collaborator"
       const redirectTarget = persona === "manager" ? "/dashboard" : "/portal/tickets"
       const url = `${resolvedAppUrl}/machines/handshake?token=${encodeURIComponent(data.machineToken)}&redirect=${encodeURIComponent(redirectTarget)}`
       window.location.href = url