diff --git a/activemq-web-console/src/main/webapp/WEB-INF/tags/form/short.tag b/activemq-web-console/src/main/webapp/WEB-INF/tags/form/short.tag
index cb4987b..03550c3 100644
--- a/activemq-web-console/src/main/webapp/WEB-INF/tags/form/short.tag
+++ b/activemq-web-console/src/main/webapp/WEB-INF/tags/form/short.tag
@@ -17,8 +17,8 @@
 <%@ attribute name="text" type="java.lang.String" required="true"  %>
 <%@ attribute name="length" type="java.lang.Integer" required="false" %>
 <%
- text = org.apache.commons.lang.StringEscapeUtils.escapeHtml(text);
- text = org.apache.commons.lang.StringEscapeUtils.escapeJavaScript(text);
+ text = org.apache.commons.lang3.StringEscapeUtils.escapeHtml4(text);
+ text = org.apache.commons.lang3.StringEscapeUtils.escapeEcmaScript(text);
  if (length == null || length < 20)
     length = 20;
  if (text.length() <= length) {
diff --git a/activemq-web-console/src/main/webapp/WEB-INF/tags/form/text.tag b/activemq-web-console/src/main/webapp/WEB-INF/tags/form/text.tag
index 521bc6d..0bbb0f6 100644
--- a/activemq-web-console/src/main/webapp/WEB-INF/tags/form/text.tag
+++ b/activemq-web-console/src/main/webapp/WEB-INF/tags/form/text.tag
@@ -24,7 +24,7 @@
 	if (value == null) {
 		value = "";
 	}
-	value = org.apache.commons.lang.StringEscapeUtils.escapeHtml(value);
+	value = org.apache.commons.lang3.StringEscapeUtils.escapeHtml4(value);
 
 %>
 <input type="text" name="${name}" value="<%= value %>"/>