Fixed user name parsing issue