handle username consistently
Merge pull request #89 from flyingmachine/master

handle username consistently