diff --git a/omod/src/main/webapp/admin/encounters/encounterForm.jsp b/omod/src/main/webapp/admin/encounters/encounterForm.jsp
index 5b1f4aa4..d5bebf32 100644
--- a/omod/src/main/webapp/admin/encounters/encounterForm.jsp
+++ b/omod/src/main/webapp/admin/encounters/encounterForm.jsp
@@ -307,7 +307,7 @@
 					</spring:bind>
 				</div>
 				<div id="patient_label">
-					<a href="../../patientDashboard.form?patientId=${encounter.patient.patientId}" >${encounter.patient.personName}</a>
+					<a href="../../patientDashboard.form?patientId=${encounter.patient.patientId}" ><c:out value='${encounter.patient.personName}'/></a>
 				</div>
 					<a id ="patient_change_link" href="#Change patient" onClick="makePatientFieldEditable()">
 						(<openmrs:message code="Encounter.transfer.change"/>)
diff --git a/omod/src/main/webapp/admin/patients/patientForm.jsp b/omod/src/main/webapp/admin/patients/patientForm.jsp
index defccf15..d26498c5 100644
--- a/omod/src/main/webapp/admin/patients/patientForm.jsp
+++ b/omod/src/main/webapp/admin/patients/patientForm.jsp
@@ -182,6 +182,21 @@
 			obj.parentNode.removeChild(obj);
 	}
 
+	function beforeSubmit() {
+		removeBlankData()
+
+		sanitizeFields();
+
+		return true;
+
+	}
+
+	function sanitizeFields(){
+		var inputfields=document.querySelectorAll('input[type="text"]');
+		inputfields.forEach(function(input) {
+			input.value = html_sanitize(input.value);
+		});
+	}
 	function preferredBoxClick(obj) {
 		var inputs = document.getElementsByTagName("input");
 		if (obj.checked == true) {
@@ -345,7 +360,7 @@
     <openmrs_tag:errorNotify errors="${errors}" />
 </spring:hasBindErrors>
 
-<form method="post" onSubmit="removeBlankData()">
+<form method="post" onSubmit="return beforeSubmit()">
 
 	<h3><openmrs:message code="Patient.identifiers"/></h3>
 		<spring:hasBindErrors name="patient.identifiers">