Fix user name bug
Merge branch 'demo_display_fixes'