RT# 79353 Fix XSS