diff --git a/pagure/templates/issue.html b/pagure/templates/issue.html
index a15039c..997a59c 100644
--- a/pagure/templates/issue.html
+++ b/pagure/templates/issue.html
@@ -298,6 +298,7 @@ $(document).ready(function() {
       data: resp['mention'],
       insertTpl: '@${username}',
       displayTpl: "<li><img src=\"${image}\"> ${username} <small>${name}</small></li>",
+      searchKey: "username"
     }
     $("#comment").atwho(userConfig);
   });
diff --git a/pagure/templates/pull_request.html b/pagure/templates/pull_request.html
index a7532ef..4cb28d2 100644
--- a/pagure/templates/pull_request.html
+++ b/pagure/templates/pull_request.html
@@ -1195,6 +1195,7 @@ $(document).ready(function () {
        data: resp['mention'],
        insertTpl: '@${username}',
        displayTpl: "<li><img src=\"${image}\"> ${username} <small>${name}</small></li>",
+       searchKey: "username"
      }
      $("#comment").atwho(userConfig);
    });