Fix username detector