diff --git a/plexpy/datafactory.py b/plexpy/datafactory.py
index c5dee357..b9c9d559 100644
--- a/plexpy/datafactory.py
+++ b/plexpy/datafactory.py
@@ -40,7 +40,7 @@ class DataFactory(object):
 		            SUM(CASE WHEN paused_counter IS NULL THEN 0 ELSE paused_counter END) AS duration', 
                    'SUM(CASE WHEN paused_counter IS NULL THEN 0 ELSE paused_counter END) AS paused_counter', 
                    'session_history.user_id',
-                   'user',
+                   'session_history.user',
                    '(CASE WHEN users.friendly_name IS NULL THEN user ELSE users.friendly_name END) as friendly_name',
                    'player',
                    'ip_address',
diff --git a/plexpy/webserve.py b/plexpy/webserve.py
index 1677374c..4fde95eb 100644
--- a/plexpy/webserve.py
+++ b/plexpy/webserve.py
@@ -580,9 +580,9 @@ class WebInterface(object):
 
         custom_where=[]
         if user_id:
-            custom_where = [['user_id', user_id]]
+            custom_where = [['session_history.user_id', user_id]]
         elif user:
-            custom_where = [['user', user]]
+            custom_where = [['session_history.user', user]]
         if 'rating_key' in kwargs:
             rating_key = kwargs.get('rating_key', "")
             custom_where = [['session_history.rating_key', rating_key]]