[#2222] parseUserName fix, mild change to validate for simplicity, test fixes