JMWE-202 & JMWE-204 resolve usernames in addition to user keys