diff --git a/src/Server.py b/src/Server.py
index 875cc89..0a5a09c 100644
--- a/src/Server.py
+++ b/src/Server.py
@@ -2035,7 +2035,6 @@ def serve_webui(request: Request = None):
                 </div>
                 <div class="kpi-value" style="font-size: 18px; color: #60a5fa;">mTLS Port {config.get('tcp_port', 9443)}</div>
                 <div class="kpi-sub">Hermes Provisioning API: Port {config.get('hermes_port', 8443)}</div>
-                <div class="kpi-sub" style="margin-top:4px;">Fingerprint: <code style="cursor:pointer;" onclick="copyText('{summary['server_fingerprint']}', 'Server Fingerprint')">{summary['server_fingerprint'][:16]}...</code></div>
             </div>
 
             <div class="card">
@@ -2045,7 +2044,6 @@ def serve_webui(request: Request = None):
                 </div>
                 <div class="kpi-value" style="font-size: 16px; word-break: break-all; color:#c084fc;">{summary['license_id']}</div>
                 <div class="kpi-sub">Expires: <strong>{summary['not_valid_after'][:10] if summary['not_valid_after'] != 'N/A' else 'N/A'}</strong> ({summary['days_remaining']} days left)</div>
-                <div class="kpi-sub" style="margin-top:4px;">Authority: <code>{summary['issuer_url']}</code></div>
             </div>
 
             <div class="card">
@@ -2177,6 +2175,10 @@ def serve_webui(request: Request = None):
                         <div class="kpi-sub">Master Root Issuer</div>
                         <div style="font-weight: 700; margin-top: 2px;">{summary['issuer_cn']}</div>
                     </div>
+                    <div>
+                        <div class="kpi-sub">Master License Authority</div>
+                        <div style="font-weight: 700; margin-top: 2px; word-break: break-all;"><code>{summary['issuer_url']}</code></div>
+                    </div>
                     <div>
                         <div class="kpi-sub">Issued Seat Quota</div>
                         <div style="font-weight: 700; color: #34d399; margin-top: 2px;">{summary['max_seats']} Seats</div>
@@ -2185,6 +2187,14 @@ def serve_webui(request: Request = None):
                         <div class="kpi-sub">Certificate Validity</div>
                         <div style="font-weight: 700; margin-top: 2px;">{summary['not_valid_after'][:19] if summary['not_valid_after'] != 'N/A' else 'N/A'}</div>
                     </div>
+                    <div>
+                        <div class="kpi-sub">Server Hub Fingerprint</div>
+                        <div style="font-weight: 700; margin-top: 2px; word-break: break-all;"><code style="cursor:pointer;" onclick="copyText('{summary['server_fingerprint']}', 'Server Hub Fingerprint')">{summary['server_fingerprint']}</code></div>
+                    </div>
+                    <div>
+                        <div class="kpi-sub">CA Certificate Fingerprint</div>
+                        <div style="font-weight: 700; margin-top: 2px; word-break: break-all;"><code style="cursor:pointer;" onclick="copyText('{summary['fingerprint']}', 'CA Certificate Fingerprint')">{summary['fingerprint']}</code></div>
+                    </div>
                 </div>
             </div>
         </div>