use User Name in a consistent way in the UI everywhere. Fixes #763

Fixes the issue in #763