Fix handling of username
Merge pull request #1 from crazymaster/master

Fix handling of username