Bug fix - capitalization error
Merge branch 'shortid-username' into integration