diff --git a/ogcp/static/js/ogcp.js b/ogcp/static/js/ogcp.js
index 3c53035..5259ea1 100644
--- a/ogcp/static/js/ogcp.js
+++ b/ogcp/static/js/ogcp.js
@@ -23,8 +23,9 @@ function showSelectedClient(client_checkbox) {
 
     if (client_checkbox.checked) {
         if (!($('#' + pill_id).length)) {
+            const client_name = client_checkbox.name.replaceAll(/_\d+$/g, '');
             $(container).append('<div class="badge badge-pill og-pill badge-light" ' +
-                                'id="'+ pill_id + '">' + client_checkbox.name +
+                                'id="'+ pill_id + '">' + client_name +
                                 '<br>' + client_checkbox.value + '</div>');
             show_client_mac(pill_id);
         }