GH139: Refactor username validation
Merge pull request #146 from 35aa/GH139

GH139: Refactor username validation