Fix username parsing