fix uses of @userForId to prevent warnings
Merge pull request #482 from kch/user-for-id-deprecation

fix uses of @userForId to prevent warnings