ticket:35 rename USERNAME->JID