Closes #309: reset UserId when creating new User
Merge commit 'c49c1a84dd63bee9d79265ed450ef5f531cae981' into HEAD