diff --git a/apps/admin/dist.zip b/apps/admin/dist.zip
index 18a8a68..86e5781 100644
Binary files a/apps/admin/dist.zip and b/apps/admin/dist.zip differ
diff --git a/apps/admin/src/sections/user/family/family-detail-sheet.tsx b/apps/admin/src/sections/user/family/family-detail-sheet.tsx
index 24ade79..4c81ae8 100644
--- a/apps/admin/src/sections/user/family/family-detail-sheet.tsx
+++ b/apps/admin/src/sections/user/family/family-detail-sheet.tsx
@@ -261,6 +261,11 @@ export function FamilyDetailSheet({
                               <Badge variant="outline">
                                 ID: {member.user_id}
                               </Badge>
+                              {member.auth_type ? (
+                                <Badge className="uppercase">
+                                  {member.auth_type}
+                                </Badge>
+                              ) : null}
                               {member.device_no ? (
                                 <Badge variant="outline">
                                   <span className="font-mono">
@@ -268,7 +273,16 @@ export function FamilyDetailSheet({
                                   </span>
                                 </Badge>
                               ) : null}
-                              <span>{member.identifier}</span>
+                              {member.device_type ? (
+                                <Badge variant="secondary">
+                                  {member.device_type}
+                                </Badge>
+                              ) : null}
+                              <span>
+                                {member.auth_type === "device"
+                                  ? member.device_no || member.identifier
+                                  : member.identifier}
+                              </span>
                               <Badge>
                                 {getFamilyRoleLabel(t, member.role_name)}
                               </Badge>
diff --git a/apps/admin/src/sections/user/family/index.tsx b/apps/admin/src/sections/user/family/index.tsx
index 14198b0..796a487 100644
--- a/apps/admin/src/sections/user/family/index.tsx
+++ b/apps/admin/src/sections/user/family/index.tsx
@@ -54,8 +54,19 @@ export default function FamilyManagement({
         {
           accessorKey: "owner_identifier",
           header: t("owner", "Owner"),
-          cell: ({ row }) =>
-            `${row.original.owner_identifier} (ID: ${row.original.owner_user_id})`,
+          cell: ({ row }) => (
+            <div className="flex items-center gap-1">
+              {row.original.owner_auth_type ? (
+                <Badge className="uppercase">
+                  {row.original.owner_auth_type}
+                </Badge>
+              ) : null}
+              <span>{row.original.owner_identifier}</span>
+              <span className="text-muted-foreground text-xs">
+                (ID: {row.original.owner_user_id})
+              </span>
+            </div>
+          ),
         },
         {
           accessorKey: "status",
diff --git a/apps/admin/src/sections/user/index.tsx b/apps/admin/src/sections/user/index.tsx
index ebcc18a..72af829 100644
--- a/apps/admin/src/sections/user/index.tsx
+++ b/apps/admin/src/sections/user/index.tsx
@@ -163,42 +163,30 @@ export default function User() {
             <DropdownMenuContent align="end">
               <InviteStatsMenuItem userId={row.id} />
               <DropdownMenuItem asChild>
-                <Link
-                  search={{ user_id: String(row.id) }}
-                  to="/dashboard/order"
-                >
+                <Link search={{ user_id: row.id }} to="/dashboard/order">
                   {t("orderList", "Order List")}
                 </Link>
               </DropdownMenuItem>
               <DropdownMenuItem asChild>
-                <Link
-                  search={{ user_id: String(row.id) }}
-                  to="/dashboard/log/login"
-                >
+                <Link search={{ user_id: row.id }} to="/dashboard/log/login">
                   {t("loginLogs", "Login Logs")}
                 </Link>
               </DropdownMenuItem>
               <DropdownMenuItem asChild>
-                <Link
-                  search={{ user_id: String(row.id) }}
-                  to="/dashboard/log/balance"
-                >
+                <Link search={{ user_id: row.id }} to="/dashboard/log/balance">
                   {t("balanceLogs", "Balance Logs")}
                 </Link>
               </DropdownMenuItem>
               <DropdownMenuItem asChild>
                 <Link
-                  search={{ user_id: String(row.id) }}
+                  search={{ user_id: row.id }}
                   to="/dashboard/log/commission"
                 >
                   {t("commissionLogs", "Commission Logs")}
                 </Link>
               </DropdownMenuItem>
               <DropdownMenuItem asChild>
-                <Link
-                  search={{ user_id: String(row.id) }}
-                  to="/dashboard/log/gift"
-                >
+                <Link search={{ user_id: row.id }} to="/dashboard/log/gift">
                   {t("giftLogs", "Gift Logs")}
                 </Link>
               </DropdownMenuItem>
diff --git a/apps/admin/src/sections/user/user-detail.tsx b/apps/admin/src/sections/user/user-detail.tsx
index 320feaf..7f530ca 100644
--- a/apps/admin/src/sections/user/user-detail.tsx
+++ b/apps/admin/src/sections/user/user-detail.tsx
@@ -12,7 +12,6 @@ import {
   getUserDetail,
   getUserSubscribeById,
 } from "@workspace/ui/services/admin/user";
-import { shortenDeviceIdentifier } from "@workspace/ui/utils/device";
 import { formatBytes } from "@workspace/ui/utils/formatting";
 import { useTranslation } from "react-i18next";
 import { Display } from "@/components/display";
@@ -230,21 +229,29 @@ export function UserDetail({ id }: { id: number }) {
 
   if (!id) return "--";
 
-  const emailMethod = data?.auth_methods.find((m) => m.auth_type === "email");
   const firstMethod = data?.auth_methods[0];
-  const rawIdentifier =
-    emailMethod?.auth_identifier || firstMethod?.auth_identifier || "";
-  const isDevice = !emailMethod && firstMethod?.auth_type === "device";
-  const identifier = isDevice
-    ? shortenDeviceIdentifier(rawIdentifier)
-    : rawIdentifier;
+  const isDevice = firstMethod?.auth_type === "device";
+  const deviceNo = (data as any)?.user_devices?.[0]?.device_no;
+  const rawIdentifier = firstMethod?.auth_identifier || "";
+  const identifier = isDevice ? deviceNo || rawIdentifier : rawIdentifier;
 
   return (
     <HoverCard>
       <HoverCardTrigger asChild>
         <Button asChild className="p-0" variant="link">
           <Link search={{ user_id: id }} to="/dashboard/user">
-            {identifier || t("loading", "Loading...")}
+            {data ? (
+              <>
+                {firstMethod && (
+                  <span className="mr-1 inline-flex items-center rounded border px-1 py-0.5 font-mono text-xs uppercase">
+                    {firstMethod.auth_type}
+                  </span>
+                )}
+                {identifier}
+              </>
+            ) : (
+              t("loading", "Loading...")
+            )}
           </Link>
         </Button>
       </HoverCardTrigger>
diff --git a/apps/admin/src/sections/user/user-subscription/index.tsx b/apps/admin/src/sections/user/user-subscription/index.tsx
index bff7818..3723f6a 100644
--- a/apps/admin/src/sections/user/user-subscription/index.tsx
+++ b/apps/admin/src/sections/user/user-subscription/index.tsx
@@ -1,4 +1,4 @@
-import { Link } from "@tanstack/react-router";
+import { Link, useNavigate } from "@tanstack/react-router";
 import { Alert, AlertDescription } from "@workspace/ui/components/alert";
 import { Badge } from "@workspace/ui/components/badge";
 import { Button } from "@workspace/ui/components/button";
@@ -42,6 +42,7 @@ export default function UserSubscription({ userId }: { userId: number }) {
   const [loading, setLoading] = useState(false);
   const ref = useRef<ProTableActions>(null);
   const [sharedInfo, setSharedInfo] = useState<SharedInfo | null>(null);
+  const navigate = useNavigate();
 
   const request = useCallback(
     async (pagination: { page: number; size: number }) => {
@@ -116,19 +117,23 @@ export default function UserSubscription({ userId }: { userId: number }) {
             <span className="flex gap-2">
               <Button asChild size="sm" variant="outline">
                 <Link
-                  search={{ user_id: String(sharedInfo.ownerUserId) }}
+                  search={{ user_id: sharedInfo.ownerUserId }}
                   to="/dashboard/family"
                 >
                   {t("viewDeviceGroup", "View Device Group")}
                 </Link>
               </Button>
-              <Button asChild size="sm" variant="outline">
-                <Link
-                  search={{ user_id: String(sharedInfo.ownerUserId) }}
-                  to="/dashboard/user"
-                >
-                  {t("viewOwner", "View Owner")}
-                </Link>
+              <Button
+                onClick={() => {
+                  navigate({
+                    to: "/dashboard/user",
+                    search: { user_id: sharedInfo.ownerUserId },
+                  });
+                }}
+                size="sm"
+                variant="outline"
+              >
+                {t("viewOwner", "View Owner")}
               </Button>
             </span>
           </AlertDescription>
diff --git a/packages/ui/src/services/admin/typings.d.ts b/packages/ui/src/services/admin/typings.d.ts
index 5261a87..47cb58f 100644
--- a/packages/ui/src/services/admin/typings.d.ts
+++ b/packages/ui/src/services/admin/typings.d.ts
@@ -2607,7 +2607,9 @@ declare namespace API {
   type FamilyMemberItem = {
     user_id: number;
     identifier: string;
+    auth_type: string;
     device_no: string;
+    device_type: string;
     role: number;
     role_name: string;
     status: number;
@@ -2621,6 +2623,7 @@ declare namespace API {
     family_id: number;
     owner_user_id: number;
     owner_identifier: string;
+    owner_auth_type: string;
     status: string;
     active_member_count: number;
     max_members: number;