Merge pull request #530 from xmtp/rygine/update-user-preference-dep

Merge pull request #530 from xmtp/rygine/update-user-preference-dep #1773