Fix username finding