diff --git a/app/Http/Controllers/Admin/Master/UserController.php b/app/Http/Controllers/Admin/Master/UserController.php
index 037c857..909781d 100644
--- a/app/Http/Controllers/Admin/Master/UserController.php
+++ b/app/Http/Controllers/Admin/Master/UserController.php
@@ -18,7 +18,7 @@ class UserController extends Controller
     public function index(): Response
     {
         return Inertia::render('admin/master/user/index', [
-            'users' => User::with('profile')->latest()->get(),
+            'users' => User::with(['profile', 'roles'])->latest()->get(),
             'defaultPassword' => config('auth.password_default', 'password'),
         ]);
     }
diff --git a/resources/js/pages/admin/master/user/partials/columns.tsx b/resources/js/pages/admin/master/user/partials/columns.tsx
index 357103a..b9ae859 100644
--- a/resources/js/pages/admin/master/user/partials/columns.tsx
+++ b/resources/js/pages/admin/master/user/partials/columns.tsx
@@ -9,6 +9,8 @@ import type { User } from '@/types';
 import { Link } from '@inertiajs/react';
 import type { ColumnDef } from '@tanstack/react-table';
 import { KeyRound, Pencil, Trash2 } from 'lucide-react';
+import { Badge } from '@/components/ui/badge';
+import { formatCurrency, formatDate } from '@/lib/formatters';
 
 interface ColumnProps {
     onResetPassword: (user: User) => void;
@@ -40,6 +42,42 @@ export const getColumns = ({ onResetPassword, onDelete, onToggleStatus }: Column
         ),
         meta: { title: "Nama Pengguna" },
     },
+    {
+        accessorFn: (row) => row.roles?.map(role => role.name).join(', '),
+        id: "roles",
+        header: ({ column }) => (
+            <DataTableColumnHeader column={column} title="Peran" />
+        ),
+        meta: { title: "Peran" },
+        cell: ({ row }) => {
+            const roles = row.original.roles;
+            return (
+                <div className="flex flex-wrap gap-1">
+                    {roles?.map((role) => (
+                        <Badge key={role.id} variant="outline" className="capitalize">
+                            {role.name}
+                        </Badge>
+                    ))}
+                </div>
+            );
+        }
+    },
+    {
+        accessorFn: (row) => row.profile?.nik,
+        id: "nik",
+        header: ({ column }) => (
+            <DataTableColumnHeader column={column} title="NIK" />
+        ),
+        meta: { title: "NIK" },
+    },
+    {
+        accessorFn: (row) => row.profile?.full_name,
+        id: "full_name",
+        header: ({ column }) => (
+            <DataTableColumnHeader column={column} title="Nama Lengkap" />
+        ),
+        meta: { title: "Nama Lengkap" },
+    },
     {
         accessorFn: (row) => row.profile?.phone_number,
         id: "phone_number",
@@ -48,6 +86,45 @@ export const getColumns = ({ onResetPassword, onDelete, onToggleStatus }: Column
         ),
         meta: { title: "Nomor Telepon" },
     },
+    {
+        accessorFn: (row) => row.profile?.address,
+        id: "address",
+        header: ({ column }) => (
+            <DataTableColumnHeader column={column} title="Alamat" />
+        ),
+        meta: { title: "Alamat" },
+        cell: ({ row }) => (
+            <div className="max-w-[200px] truncate" title={row.original.profile?.address}>
+                {row.original.profile?.address || '-'}
+            </div>
+        )
+    },
+    {
+        accessorFn: (row) => `${row.profile?.birth_place}, ${row.profile?.birth_date}`,
+        id: "birth_info",
+        header: ({ column }) => (
+            <DataTableColumnHeader column={column} title="Tempat, Tgl Lahir" />
+        ),
+        meta: { title: "Tempat, Tgl Lahir" },
+        cell: ({ row }) => {
+            const profile = row.original.profile;
+            if (!profile?.birth_place && !profile?.birth_date) return '-';
+            return (
+                <span>
+                    {profile.birth_place || '-'}, {formatDate(profile.birth_date)}
+                </span>
+            );
+        }
+    },
+    {
+        accessorFn: (row) => row.profile?.base_salary,
+        id: "base_salary",
+        header: ({ column }) => (
+            <DataTableColumnHeader column={column} title="Gaji Pokok" />
+        ),
+        meta: { title: "Gaji Pokok" },
+        cell: ({ row }) => formatCurrency(row.original.profile?.base_salary || 0)
+    },
     {
         accessorKey: "is_active",
         header: "Status",
diff --git a/resources/js/types/auth.ts b/resources/js/types/auth.ts
index 0b58520..b3609e2 100644
--- a/resources/js/types/auth.ts
+++ b/resources/js/types/auth.ts
@@ -7,6 +7,7 @@ export type UserProfile = {
     address: string;
     birth_place: string;
     birth_date: string;
+    base_salary: number;
     created_at: string;
     updated_at: string;
 };
@@ -23,6 +24,7 @@ export type User = {
     updated_at: string;
     is_active: boolean;
     profile?: UserProfile;
+    roles?: import('./role').Role[];
     [key: string]: unknown;
 };