diff --git a/src/pages/admin/ModulesPage.vue b/src/pages/admin/ModulesPage.vue
index 336467b..db5b1dd 100644
--- a/src/pages/admin/ModulesPage.vue
+++ b/src/pages/admin/ModulesPage.vue
@@ -18,7 +18,9 @@
 
     <el-table v-else :data="modules" stripe border class="w-full shadow-sm">
       <template #empty><el-empty description="目前無模組" /></template>
-      <el-table-column prop="system_key" label="System" width="140" />
+      <el-table-column label="System" min-width="200">
+        <template #default="{ row }">{{ getSystemName(row.system_key) }}</template>
+      </el-table-column>
       <el-table-column prop="module_key" label="Module Key" width="220" />
       <el-table-column prop="name" label="名稱" min-width="180" />
       <el-table-column prop="status" label="狀態" width="120" />
@@ -217,5 +219,10 @@ async function openRelations(row, tab) {
   }
 }
 
+function getSystemName(systemKey) {
+  const system = systems.value.find(s => s.system_key === systemKey)
+  return system ? system.name : systemKey
+}
+
 onMounted(load)
 </script>
diff --git a/src/pages/admin/SitesPage.vue b/src/pages/admin/SitesPage.vue
index 1eb2285..1b89b21 100644
--- a/src/pages/admin/SitesPage.vue
+++ b/src/pages/admin/SitesPage.vue
@@ -11,7 +11,9 @@
     <el-table v-else :data="sites" stripe border class="w-full shadow-sm">
       <template #empty><el-empty description="目前無站台" /></template>
       <el-table-column prop="site_key" label="Site Key" width="180" />
-      <el-table-column prop="company_key" label="Company" width="180" />
+      <el-table-column label="Company" min-width="220">
+        <template #default="{ row }">{{ getCompanyName(row.company_key) }}</template>
+      </el-table-column>
       <el-table-column prop="name" label="名稱" min-width="180" />
       <el-table-column prop="status" label="狀態" width="120" />
       <el-table-column label="操作" width="120">
@@ -120,6 +122,11 @@ function openEdit(row) {
   showEditDialog.value = true
 }
 
+function getCompanyName(companyKey) {
+  const company = companies.value.find(c => c.company_key === companyKey)
+  return company ? company.name : companyKey
+}
+
 function resetEditForm() {
   editForm.value = { site_key: '', company_key: '', name: '', status: 'active' }
 }