Fixes an error fetching user api calls
Merge branch 'hotfix/fix_user_api_calls' into develop