6.x-1.7 - minor tweaks and added field for ONID username