[PCI Compliance] XSS Vulnerability fix