diff --git a/.gitignore b/.gitignore
index 15aa0e66..37f4e251 100644
--- a/.gitignore
+++ b/.gitignore
@@ -34,6 +34,7 @@ app.ini
 create_services.py
 gen_random.py
 sync_salt_modules.py
+change_times.py
 rmm-*.exe
 rmm-*.ps1
 api/tacticalrmm/accounts/management/commands/*.json
diff --git a/web/src/components/AgentTable.vue b/web/src/components/AgentTable.vue
index a42bddc9..16dee0e9 100644
--- a/web/src/components/AgentTable.vue
+++ b/web/src/components/AgentTable.vue
@@ -416,7 +416,7 @@ export default {
         }
 
         // fix for last_logged_in_user not filtering
-        if (row.logged_in_username === "None" && row.status === "online")
+        if (row.logged_in_username === "None" && row.status === "online" && !!row.last_logged_in_user)
           return row.last_logged_in_user.toLowerCase().indexOf(search) !== -1;
 
         // Normal text filter