More username related changes