Edited mapUserFromContext() method