++ Use client id and icon.png name instead of user supplied name