fixing assumption in (user-id ...) fn that was causing tracking of user-join event to not work.
Merge branch 'production'