diff --git a/src/app/[orgId]/settings/clients/machine/create/page.tsx b/src/app/[orgId]/settings/clients/machine/create/page.tsx
index a0489f30..2f1d5f8b 100644
--- a/src/app/[orgId]/settings/clients/machine/create/page.tsx
+++ b/src/app/[orgId]/settings/clients/machine/create/page.tsx
@@ -140,7 +140,7 @@ export default function Page() {
                     },
                     {
                         title: t("run"),
-                        command: `sudo olm --id ${id} --secret ${secret} --endpoint ${endpoint}`
+                        command: `sudo olm --id ${id} --secret ${secret} --endpoint ${endpoint} --org ${orgId}`
                     }
                 ]
             },
@@ -152,7 +152,7 @@ export default function Page() {
                     },
                     {
                         title: t("run"),
-                        command: `olm.exe --id ${id} --secret ${secret} --endpoint ${endpoint}`
+                        command: `olm.exe --id ${id} --secret ${secret} --endpoint ${endpoint} --org ${orgId}`
                     }
                 ]
             }
diff --git a/src/components/ClientResourcesTable.tsx b/src/components/ClientResourcesTable.tsx
index 001cb132..e813cb57 100644
--- a/src/components/ClientResourcesTable.tsx
+++ b/src/components/ClientResourcesTable.tsx
@@ -160,8 +160,8 @@ export default function ClientResourcesTable({
         },
         {
             accessorKey: "siteName",
-            friendlyName: t("siteName"),
-            header: () => <span className="p-3">{t("siteName")}</span>,
+            friendlyName: t("site"),
+            header: () => <span className="p-3">{t("site")}</span>,
             cell: ({ row }) => {
                 const resourceRow = row.original;
                 return (
@@ -219,7 +219,7 @@ export default function ClientResourcesTable({
             ),
             cell: ({ row }) => {
                 const resourceRow = row.original;
-                return resourceRow.alias ? (
+                return resourceRow.mode === "host" && resourceRow.alias ? (
                     <CopyToClipboard
                         text={resourceRow.alias}
                         isLink={false}
diff --git a/src/components/UserDevicesTable.tsx b/src/components/UserDevicesTable.tsx
index 256e0a00..cd203b51 100644
--- a/src/components/UserDevicesTable.tsx
+++ b/src/components/UserDevicesTable.tsx
@@ -124,7 +124,7 @@ export default function UserDevicesTable({ userClients }: ClientTableProps) {
                 }
             },
             {
-                accessorKey: "userId",
+                accessorKey: "userEmail",
                 friendlyName: "User",
                 header: ({ column }) => {
                     return (