User tracking hotfix