Tweak username creation algorithm & add test