Displays correct username
Merge branch 'hotfix/v0.3.5'
Displays correct username