diff --git a/server/src/resolvers/Query.js b/server/src/resolvers/Query.js
index 2ff6a66..341d99b 100755
--- a/server/src/resolvers/Query.js
+++ b/server/src/resolvers/Query.js
@@ -121,6 +121,7 @@ const Query = {
       .filter(
         user =>
           user.displayName.toLowerCase().includes(search.toLowerCase()) ||
+          user.sAMAccountName.toLowerCase().includes(search.toLowerCase()) ||
           user.WifiDevice.some(device =>
             device.apName.toLowerCase().includes(search.toLowerCase())
           )
@@ -138,7 +139,7 @@ const Query = {
       a.wifiDevices[0].lastSeen > b.wifiDevices[0].lastSeen ? -1 : 1
     )
 
-    return sortedUserPresences.slice(0, 1000)
+    return sortedUserPresences.slice(0, 100)
   }
 }