Minor fix the username logic