Fix translation problem. Fix username bug part II