diff --git a/infogami/infobase/client.py b/infogami/infobase/client.py
index 523b21d7..5651b566 100644
--- a/infogami/infobase/client.py
+++ b/infogami/infobase/client.py
@@ -531,8 +531,8 @@ def reset_password(self, username, code, password):
         )
 
     def get_user(self):
-        # avoid hitting infobase when there is no cookie.
-        if web.cookies().get(config.login_cookie_name) is None:
+        # avoid hitting infobase when there is no auth token set.
+        if self._conn.get_auth_token() is None:
             return None
         try:
             data = self._request('/account/get_user')