diff --git a/server/oauth/hep_client.py b/server/oauth/hep_client.py
index 6cc073c9..87ff7e2c 100644
--- a/server/oauth/hep_client.py
+++ b/server/oauth/hep_client.py
@@ -50,7 +50,7 @@ class HepClient:
             raise HepClientNoTokenException
 
         if not token_dict:
-            token_dict = token_dict('', request)
+            token_dict = fetch_token('', request)
             if not token_dict:
                 raise HepClientNoTokenException
 
diff --git a/server/oauth/user_signup_login_handler.py b/server/oauth/user_signup_login_handler.py
index 53f2b70a..fa3758c4 100644
--- a/server/oauth/user_signup_login_handler.py
+++ b/server/oauth/user_signup_login_handler.py
@@ -37,7 +37,7 @@ def handle_user_and_verify_products(user_data, token):
 
 def check_and_create_licenses(hep_client, user, token):
     try:
-        product = hep_client.active_myskillbox_product_for_customer(token=token)
+        product = hep_client.active_myskillbox_product_for_customer(token_dict=token)
     except HepClientException:
         return None, UNKNOWN_ERROR
 
diff --git a/server/oauth/views.py b/server/oauth/views.py
index ab67ba85..3add2fa4 100644
--- a/server/oauth/views.py
+++ b/server/oauth/views.py
@@ -19,7 +19,7 @@ def authorize(request):
     hep_client = HepClient()
     try:
         token = oauth.hep.authorize_access_token(request)
-        user_data = hep_client.user_details(token=token)
+        user_data = hep_client.user_details(token_dict=token)
 
         user, status_msg = handle_user_and_verify_products(user_data, token)
         user.sync_with_hep_data(user_data)