fixed signup username bug
Merge branch 'staging'