RPV 207 - Fix to username