case 2254 - Use actual username instead of hash.
Merge branch 'case-2254' into develop