Allow hyphen in username (fix first part of #441)
I currently do not have a user account with a hyphen, so I can't test if the bug is completely resolved
Merge pull request #539 from mc10/usernamefix

Allow hyphen in username (fix first part of issue #441)