diff --git a/public/src/app.js b/public/src/app.js
index 82a2a8c478..f8a3a643ef 100644
--- a/public/src/app.js
+++ b/public/src/app.js
@@ -398,7 +398,7 @@ app.cacheBuster = null;
 		}
 		if (registerMessage) {
 			$(document).ready(function () {
-				showAlert('register', decodeURIComponent(registerMessage));
+				showAlert('register', utils.escapeHTML(decodeURIComponent(registerMessage)));
 				registerMessage = false;
 			});
 		}
diff --git a/public/src/modules/translator.js b/public/src/modules/translator.js
index 74d6b867c2..5c7b3366e2 100644
--- a/public/src/modules/translator.js
+++ b/public/src/modules/translator.js
@@ -361,7 +361,7 @@
 
 			var nodes = descendantTextNodes(element);
 			var text = nodes.map(function (node) {
-				return node.nodeValue;
+				return utils.escapeHTML(node.nodeValue);
 			}).join('  ||  ');
 
 			var attrNodes = attributes.reduce(function (prev, attr) {