fix username issue