Fix demo user dashboards
Merge remote-tracking branch 'rt/master'