diff --git a/pyperi/pyperi.py b/pyperi/pyperi.py
index f68ba54..a8a40b0 100644
--- a/pyperi/pyperi.py
+++ b/pyperi/pyperi.py
@@ -121,7 +121,7 @@ def get_web_public_user_session_tokens(self, user_id=None, username=None):
             'broadcastHistory', 'serviceToken', 'thumbnailPlaylist'
         ]
 
-        out = {'user_id': data_store['Tracking']['userId']}
+        out = {'user_id': data_store['UserCache']['usernames'][username.lower()]}
         for token_name in token_names:
             out[token_name] = public_tokens[token_name]['token']['session_id']