current user tracking v0.1
current user tracking fix