Fix Username is not parsed correctly