Fix username-detection even more