diff --git a/lang/zh_TW.json b/lang/zh_TW.json
index 30fd97a..82f436a 100644
--- a/lang/zh_TW.json
+++ b/lang/zh_TW.json
@@ -42,7 +42,7 @@
     "All": "全部",
     "All Affiliations": "全部單位",
     "All Categories": "所有類別",
-    "All Companies": "所有公司",
+    "All Companies": "全部單位",
     "All Levels": "所有層級",
     "All Machines": "所有機台",
     "All Times System Timezone": "所有時間為系統時區",
@@ -73,8 +73,8 @@
     "Basic Information": "基本資訊",
     "Basic Settings": "基本設定",
     "Batch No": "批號",
-    "Belongs To": "所屬公司",
-    "Belongs To Company": "所屬公司",
+    "Belongs To": "所屬單位",
+    "Belongs To Company": "所屬單位",
     "Cancel": "取消",
     "Cancel Purchase": "取消購買",
     "Cannot Delete Role": "無法刪除該角色",
@@ -97,7 +97,7 @@
     "Click here to re-send the verification email.": "點擊此處重新發送驗證郵件。",
     "Click to upload": "點擊上傳",
     "Close Panel": "關閉控制面板",
-    "Company": "所屬客戶",
+    "Company": "所屬單位",
     "Company Code": "公司代碼",
     "Company Information": "公司資訊",
     "Company Level": "客戶層級",
@@ -329,6 +329,7 @@
     "New Password (leave blank to keep current)": "新密碼 (若不修改請留空)",
     "New Record": "新增單據",
     "New Sub Account Role": "新增子帳號角色",
+    "No Company": "系統",
     "Next": "下一頁",
     "No Invoice": "不開立發票",
     "No accounts found": "找不到帳號資料",
@@ -385,7 +386,7 @@
     "Orders": "購買單",
     "Other Permissions": "其他權限",
     "Others": "其他功能",
-    "Owner": "所屬公司",
+    "Owner": "所屬單位",
     "PARTNER_KEY": "PARTNER_KEY",
     "PI_MERCHANT_ID": "Pi 拍錢包 商店代號",
     "PS_MERCHANT_ID": "全盈+Pay 商店代號",
@@ -501,11 +502,11 @@
     "Search serial or machine...": "搜尋序號或機台名稱...",
     "Search users...": "搜尋用戶...",
     "Select All": "全選",
-    "Select Company": "選擇所屬公司",
+    "Select Company": "選擇所屬單位",
     "Select Machine": "選擇機台",
     "Select Machine to view metrics": "請選擇機台以查看指標",
     "Select Model": "選擇型號",
-    "Select Owner": "選擇所屬公司",
+    "Select Owner": "選擇所屬單位",
     "Select a machine to deep dive": "請選擇機台以開始深度分析",
     "Select date to sync data": "選擇日期以同步數據",
     "Selected": "已選擇",
@@ -552,6 +553,7 @@
     "System super admin accounts cannot be deleted.": "系統超級管理員帳號無法刪除。",
     "System super admin accounts cannot be modified via this interface.": "系統超級管理員帳號無法透過此介面修改。",
     "Systems Initializing": "系統初始化中",
+    "System": "系統",
     "TapPay Integration": "TapPay 支付串接",
     "TapPay Integration Settings Description": "喬睿科技支付串接設定",
     "Target": "目標",
diff --git a/resources/views/admin/basic-settings/machines/index.blade.php b/resources/views/admin/basic-settings/machines/index.blade.php
index 2a03316..b2db5a5 100644
--- a/resources/views/admin/basic-settings/machines/index.blade.php
+++ b/resources/views/admin/basic-settings/machines/index.blade.php
@@ -264,7 +264,7 @@
         <td class="px-6 py-6">
             <span
                 class="px-2.5 py-1 rounded-lg text-xs font-bold border border-sky-100 dark:border-sky-900/30 bg-sky-50 dark:bg-sky-900/20 text-sky-600 dark:text-sky-400 tracking-widest">
-                {{ $machine->company->name ?? __('None') }}
+                {{ $machine->company->name ?? __('System') }}
             </span>
         </td>
         <td class="px-6 py-6 text-right flex items-center justify-end gap-2">