Fix some bugs with handling of user updates
Change expectation of canonical_id in user json to just id