* User tracking fix