diff --git a/src/metabase/api/user.clj b/src/metabase/api/user.clj
index f5700956f7c8f70427148deb5a0f4c944df88832..15dd2b30e36cba6ff5faadc347f7824c255ff433 100644
--- a/src/metabase/api/user.clj
+++ b/src/metabase/api/user.clj
@@ -216,7 +216,7 @@
           data           (into #{}
                           (t2/select
                            (vec (cons User (user-visible-columns)))
-                           (cond-> (user-clauses nil nil (remove #{1} user_group_ids) nil)
+                           (cond-> (user-clauses nil nil (remove #{(u/the-id (perms-group/all-users))} user_group_ids) nil)
                              true (sql.helpers/order-by [:%lower.last_name :asc] [:%lower.first_name :asc])
                              (some? mw.offset-paging/*limit*)  (sql.helpers/limit mw.offset-paging/*limit*)
                              (some? mw.offset-paging/*offset*) (sql.helpers/offset mw.offset-paging/*offset*))))]