(BecomeUser) Become user compatibility changes
Merge pull request #2 from mrvisser/become-user

(BecomeUser) Become user compatibility changes
(UserVoice) UserVoice compatibility