better user id tracking