Fixed broken user id
Merge branch '2.0'