Merge pull request #392 from SEJeff/fix-dashboard-xss-master

Fix potential for nastiness in the dashboard