diff --git a/plexpy/users.py b/plexpy/users.py
index 1eaf36ff..e36af2a7 100644
--- a/plexpy/users.py
+++ b/plexpy/users.py
@@ -21,7 +21,7 @@ class Users(object):
     def __init__(self):
         pass
 
-    def get_user_list(self, filtered_users=False, kwargs=None):
+    def get_user_list(self, kwargs=None, custom_where=None):
         data_tables = datatables.DataTables()
 
         columns = ['session_history.id',
@@ -48,7 +48,7 @@ class Users(object):
         try:
             query = data_tables.ssp_query(table_name='users',
                                           columns=columns,
-                                          custom_where=[],
+                                          custom_where=custom_where,
                                           group_by=['users.user_id'],
                                           join_types=['LEFT OUTER JOIN',
                                                       'LEFT OUTER JOIN',
@@ -72,9 +72,6 @@ class Users(object):
 
         rows = []
         for item in users:
-            if filtered_users and item["show_user"] == 0:
-                continue
-
             if item["media_type"] == 'episode' and item["parent_thumb"]:
                 thumb = item["parent_thumb"]
             elif item["media_type"] == 'episode':
diff --git a/plexpy/webserve.py b/plexpy/webserve.py
index 91040b22..49eaee85 100644
--- a/plexpy/webserve.py
+++ b/plexpy/webserve.py
@@ -255,11 +255,14 @@ class WebInterface(object):
         return serve_template(templatename="ip_address_modal.html", title="IP Address Details", data=ip_address)
 
     @cherrypy.expose
-    def get_user_list(self, filtered_users=False, **kwargs):
-        filtered_users = filtered_users == 'true'
+    def get_user_list(self, filtered_users=None, **kwargs):
+        
+        custom_where=[]
+        if filtered_users == 'true':
+            custom_where = [['show_user', 1]]
         
         user_data = users.Users()
-        user_list = user_data.get_user_list(filtered_users=filtered_users, kwargs=kwargs)
+        user_list = user_data.get_user_list(kwargs=kwargs, custom_where=custom_where)
 
         cherrypy.response.headers['Content-type'] = 'application/json'
         return json.dumps(user_list)