Use un instead of username.
Merge branch 'feature/handle-empty-client-username' into develop