Fix translation problem. Fix username bug part II
Resolve merge conflicts.
Fix username restriction.
Fix username restrictions.
Resolve merge conflict