Fix username issue