Fix username restriction.
Fix username restrictions.
Resolve merge conflict