Fixes userName xss and some of the viewer exits