More username fixes