diff --git a/plugins/endpoints/api/routes.py b/plugins/endpoints/api/routes.py
index f407e7d8..f29ab32c 100644
--- a/plugins/endpoints/api/routes.py
+++ b/plugins/endpoints/api/routes.py
@@ -2984,8 +2984,8 @@ def _send_operator_report_alert(report, asset_id, hostname):
 
     # HTML-escape all user-controlled values to prevent XSS
     safe_hostname = escape(hostname)
-    safe_computername = escape(asset.computername or hostname)
-    safe_assettag = escape(asset.assettag or 'N/A')
+    safe_name = escape(asset.name or hostname)
+    safe_assetnumber = escape(asset.assetnumber or 'N/A')
     safe_reason = escape(report.reason)
     safe_details = escape(report.details or 'No additional details provided.')
 
@@ -2995,8 +2995,8 @@ def _send_operator_report_alert(report, asset_id, hostname):
 <h2 style="color:#1a1a1a;margin:0 0 12px;">Operator Issue Report</h2>
 <div style="padding: 16px; background: #f9f9f9; border-left: 4px solid #d93f3f; margin-bottom: 16px;">
     <p style="margin: 0 0 8px; font-weight: bold; color: #d93f3f;">New Issue Report from Shop Floor</p>
-    <p style="margin: 0;"><strong>Device:</strong> <a href="{escape(device_url)}">{safe_computername}</a> ({safe_hostname})</p>
-    <p style="margin: 0;"><strong>Asset Tag:</strong> {safe_assettag}</p>
+    <p style="margin: 0;"><strong>Device:</strong> <a href="{escape(device_url)}">{safe_name}</a> ({safe_hostname})</p>
+    <p style="margin: 0;"><strong>Asset Number:</strong> {safe_assetnumber}</p>
     <p style="margin: 0;"><strong>Reason:</strong> {safe_reason}</p>
     <p style="margin: 0;"><strong>Reported:</strong> {escape(reported_at)}</p>
 </div>
@@ -3009,7 +3009,7 @@ def _send_operator_report_alert(report, asset_id, hostname):
 </div>
 '''
 
-    subject = f'Operator Issue Report: {safe_computername}'
+    subject = f'Operator Issue Report: {safe_name}'
 
     current_app.logger.info('Sending operator report alert for %s (report %d)',
                             hostname, report.operatorreportid)