Fix username checking issues