Tiny fix on username concatination
Merged with ui upstream