fix username restrictions issues
Merge pull request #1 from meandavejustice/fix-username-restict-issues

fix username restrictions issues