diff --git a/index.lp b/index.lp
index a4c8a5775b..43b91696a2 100644
--- a/index.lp
+++ b/index.lp
@@ -230,6 +230,8 @@ mg.include('scripts/lua/header_authenticated.lp','r')
                         <thead>
                             <tr>
                             <th>Client</th>
+                            <th>MAC Address</th>
+                            <th>Comment</th>
                             <th>Requests</th>
                             <th>Frequency</th>
                             </tr>
@@ -259,6 +261,8 @@ mg.include('scripts/lua/header_authenticated.lp','r')
                         <thead>
                             <tr>
                             <th>Client</th>
+                            <th>MAC Address</th>
+                            <th>Comment</th>
                             <th>Requests</th>
                             <th>Frequency</th>
                             </tr>
diff --git a/scripts/js/index.js b/scripts/js/index.js
index f79aa0df2c..b66d98bec7 100644
--- a/scripts/js/index.js
+++ b/scripts/js/index.js
@@ -306,55 +306,180 @@ function updateTopClientsTable(blocked) {
     clienttable = $("#client-frequency").find("tbody:last");
   }
 
-  $.getJSON(api, data => {
-    // Clear tables before filling them with data
-    tablecontent.remove();
-    let url;
-    let percentage;
-    const sum = blocked ? data.blocked_queries : data.total_queries;
+  // First, fetch client metadata (MAC addresses and comments)
+  // We need to fetch from both endpoints to get complete data
+  const clientsPromise = $.getJSON(document.body.dataset.apiurl + "/clients");
+  const suggestionsPromise = $.getJSON(document.body.dataset.apiurl + "/clients/_suggestions");
+
+  $.when(clientsPromise, suggestionsPromise).done((clientsResponse, suggestionsResponse) => {
+    const clientsData = clientsResponse[0];
+    const suggestionsData = suggestionsResponse[0];
+
+    // Create a mapping of client IPs/names to their metadata
+    const clientMetadata = {};
+
+    // First, process configured clients to get comments
+    const clientComments = {};
+    for (const clientInfo of clientsData.clients) {
+      clientComments[clientInfo.client] = clientInfo.comment || "";
+      // Also map by name if available
+      if (clientInfo.name && clientInfo.name.length > 0) {
+        clientComments[clientInfo.name] = clientInfo.comment || "";
+      }
+    }
 
-    // When there is no data...
-    // a) remove table if there are no results (privacy mode enabled) or
-    // b) add note if there are no results (e.g. new installation)
-    if (jQuery.isEmptyObject(data.clients)) {
-      if (privacyLevel > 1) {
-        table.remove();
-      } else {
-        clienttable.append('<tr><td colspan="3" class="text-center">- No data -</td></tr>');
-        overlay.hide();
+    // Then process suggestions to map IPs to MAC addresses
+    for (const client of suggestionsData.clients) {
+      let hwaddr = client.hwaddr ? client.hwaddr.toUpperCase() : "";
+
+      // Handle mock MAC addresses (IP-only devices)
+      if (hwaddr.startsWith("IP-")) {
+        hwaddr = "";
       }
 
-      return;
-    }
+      // Map all IP addresses to this MAC address
+      if (client.addresses && client.addresses.length > 0) {
+        const addresses = client.addresses.split(",");
+        for (const addr of addresses) {
+          const trimmedAddr = addr.trim();
+          clientMetadata[trimmedAddr] = {
+            hwaddr: hwaddr,
+            comment: clientComments[client.hwaddr] || clientComments[trimmedAddr] || ""
+          };
+        }
+      }
 
-    // Populate table with content
-    for (const client of data.clients) {
-      // Sanitize client
-      let clientname = client.name;
-      if (clientname.length === 0) clientname = client.ip;
-      url =
-        '<a href="queries?client_ip=' +
-        encodeURIComponent(client.ip) +
-        (blocked ? "&upstream=blocklist" : "") +
-        '">' +
-        utils.escapeHtml(clientname) +
-        "</a>";
-      percentage = (client.count / sum) * 100;
+      // Also map hostnames
+      if (client.names && client.names.length > 0) {
+        const names = client.names.split(",");
+        for (const name of names) {
+          const trimmedName = name.trim();
+          clientMetadata[trimmedName] = {
+            hwaddr: hwaddr,
+            comment: clientComments[client.hwaddr] || clientComments[trimmedName] || ""
+          };
+        }
+      }
 
-      // Add row to table
-      clienttable.append(
-        "<tr> " +
-          utils.addTD(url) +
-          utils.addTD(client.count) +
-          utils.addTD(utils.colorBar(percentage, sum, style)) +
-          "</tr> "
-      );
+      // Map the MAC address itself
+      if (hwaddr) {
+        clientMetadata[hwaddr] = {
+          hwaddr: hwaddr,
+          comment: clientComments[client.hwaddr] || ""
+        };
+      }
     }
 
-    // Hide overlay
-    overlay.hide();
-  }).fail(data => {
-    apiFailure(data);
+    // Now fetch top clients statistics
+    $.getJSON(api, data => {
+      // Clear tables before filling them with data
+      tablecontent.remove();
+      let url;
+      let percentage;
+      const sum = blocked ? data.blocked_queries : data.total_queries;
+
+      // When there is no data...
+      // a) remove table if there are no results (privacy mode enabled) or
+      // b) add note if there are no results (e.g. new installation)
+      if (jQuery.isEmptyObject(data.clients)) {
+        if (privacyLevel > 1) {
+          table.remove();
+        } else {
+          clienttable.append('<tr><td colspan="5" class="text-center">- No data -</td></tr>');
+          overlay.hide();
+        }
+
+        return;
+      }
+
+      // Populate table with content
+      for (const client of data.clients) {
+        // Sanitize client
+        let clientname = client.name;
+        if (clientname.length === 0) clientname = client.ip;
+        url =
+          '<a href="queries?client_ip=' +
+          encodeURIComponent(client.ip) +
+          (blocked ? "&upstream=blocklist" : "") +
+          '">' +
+          utils.escapeHtml(clientname) +
+          "</a>";
+        percentage = (client.count / sum) * 100;
+
+        // Get MAC address and comment from metadata
+        let macAddress = "";
+        let comment = "";
+
+        // Try to find metadata by IP first, then by name
+        const metadata = clientMetadata[client.ip] || clientMetadata[clientname] || null;
+        if (metadata) {
+          macAddress = metadata.hwaddr;
+          comment = metadata.comment;
+        }
+
+        // Add row to table
+        clienttable.append(
+          "<tr> " +
+            utils.addTD(url) +
+            utils.addTD(utils.escapeHtml(macAddress)) +
+            utils.addTD(utils.escapeHtml(comment)) +
+            utils.addTD(client.count) +
+            utils.addTD(utils.colorBar(percentage, sum, style)) +
+            "</tr> "
+        );
+      }
+
+      // Hide overlay
+      overlay.hide();
+    }).fail(data => {
+      apiFailure(data);
+    });
+  }).fail(() => {
+    // If we fail to load client metadata, still try to show the table without MAC/comments
+    $.getJSON(api, data => {
+      tablecontent.remove();
+      let url;
+      let percentage;
+      const sum = blocked ? data.blocked_queries : data.total_queries;
+
+      if (jQuery.isEmptyObject(data.clients)) {
+        if (privacyLevel > 1) {
+          table.remove();
+        } else {
+          clienttable.append('<tr><td colspan="5" class="text-center">- No data -</td></tr>');
+          overlay.hide();
+        }
+
+        return;
+      }
+
+      for (const client of data.clients) {
+        let clientname = client.name;
+        if (clientname.length === 0) clientname = client.ip;
+        url =
+          '<a href="queries?client_ip=' +
+          encodeURIComponent(client.ip) +
+          (blocked ? "&upstream=blocklist" : "") +
+          '">' +
+          utils.escapeHtml(clientname) +
+          "</a>";
+        percentage = (client.count / sum) * 100;
+
+        clienttable.append(
+          "<tr> " +
+            utils.addTD(url) +
+            utils.addTD("") +  // Empty MAC
+            utils.addTD("") +  // Empty comment
+            utils.addTD(client.count) +
+            utils.addTD(utils.colorBar(percentage, sum, style)) +
+            "</tr> "
+        );
+      }
+
+      overlay.hide();
+    }).fail(data => {
+      apiFailure(data);
+    });
   });
 }