User-info fixes.
Merge branch 'feature/52-user-info-fix' into staging