User name fixes

It's "user name". Also fix markup for them to use systemitem.

Change-Id: I9bb9ac86587686a43cdd9aabd1d975cb7a7c320a
Merge "User name fixes"