fix username parsing
merged from origin