WIP: fix pe/oss usernames