diff --git a/activemq-web-console/src/main/webapp/browse.jsp b/activemq-web-console/src/main/webapp/browse.jsp
index c07e9ae588..0e18e15a4e 100644
--- a/activemq-web-console/src/main/webapp/browse.jsp
+++ b/activemq-web-console/src/main/webapp/browse.jsp
@@ -14,7 +14,7 @@
See the License for the specific language governing permissions and
limitations under the License.
--%>
-
+<%-- Workaround for https://ops4j1.jira.com/browse/PAXWEB-1070 --%>
<%@include file="WEB-INF/jspf/headertags.jspf" %>
diff --git a/activemq-web-console/src/main/webapp/connection.jsp b/activemq-web-console/src/main/webapp/connection.jsp
index df0e69c127..7d218e2571 100644
--- a/activemq-web-console/src/main/webapp/connection.jsp
+++ b/activemq-web-console/src/main/webapp/connection.jsp
@@ -14,7 +14,7 @@
See the License for the specific language governing permissions and
limitations under the License.
--%>
-
+<%-- Workaround for https://ops4j1.jira.com/browse/PAXWEB-1070 --%>
<%@include file="WEB-INF/jspf/headertags.jspf" %>
diff --git a/activemq-web-console/src/main/webapp/connections.jsp b/activemq-web-console/src/main/webapp/connections.jsp
index d13e0cffc2..1d6fbab413 100644
--- a/activemq-web-console/src/main/webapp/connections.jsp
+++ b/activemq-web-console/src/main/webapp/connections.jsp
@@ -14,7 +14,7 @@
See the License for the specific language governing permissions and
limitations under the License.
--%>
-
+<%-- Workaround for https://ops4j1.jira.com/browse/PAXWEB-1070 --%>
<%@include file="WEB-INF/jspf/headertags.jspf" %>
diff --git a/activemq-web-console/src/main/webapp/graph.jsp b/activemq-web-console/src/main/webapp/graph.jsp
index fb4a268bbb..5c0c2fdc19 100644
--- a/activemq-web-console/src/main/webapp/graph.jsp
+++ b/activemq-web-console/src/main/webapp/graph.jsp
@@ -14,7 +14,7 @@
See the License for the specific language governing permissions and
limitations under the License.
--%>
-
+<%-- Workaround for https://ops4j1.jira.com/browse/PAXWEB-1070 --%>
<%@include file="WEB-INF/jspf/headertags.jspf" %>
diff --git a/activemq-web-console/src/main/webapp/index.jsp b/activemq-web-console/src/main/webapp/index.jsp
index 408bc8ff42..83f43eecf4 100644
--- a/activemq-web-console/src/main/webapp/index.jsp
+++ b/activemq-web-console/src/main/webapp/index.jsp
@@ -14,7 +14,7 @@
See the License for the specific language governing permissions and
limitations under the License.
--%>
-
+<%-- Workaround for https://ops4j1.jira.com/browse/PAXWEB-1070 --%>
<%@include file="WEB-INF/jspf/headertags.jspf" %>
diff --git a/activemq-web-console/src/main/webapp/message.jsp b/activemq-web-console/src/main/webapp/message.jsp
index c0491a86b3..7563d06b92 100644
--- a/activemq-web-console/src/main/webapp/message.jsp
+++ b/activemq-web-console/src/main/webapp/message.jsp
@@ -14,7 +14,7 @@
See the License for the specific language governing permissions and
limitations under the License.
--%>
-
+<%-- Workaround for https://ops4j1.jira.com/browse/PAXWEB-1070 --%>
<%@include file="WEB-INF/jspf/headertags.jspf" %>
diff --git a/activemq-web-console/src/main/webapp/network.jsp b/activemq-web-console/src/main/webapp/network.jsp
index 2bb854c1e1..df2a08f311 100644
--- a/activemq-web-console/src/main/webapp/network.jsp
+++ b/activemq-web-console/src/main/webapp/network.jsp
@@ -14,7 +14,7 @@
See the License for the specific language governing permissions and
limitations under the License.
--%>
-
+<%-- Workaround for https://ops4j1.jira.com/browse/PAXWEB-1070 --%>
<%@include file="WEB-INF/jspf/headertags.jspf" %>
diff --git a/activemq-web-console/src/main/webapp/queueConsumers.jsp b/activemq-web-console/src/main/webapp/queueConsumers.jsp
index 33db794197..51613975a8 100644
--- a/activemq-web-console/src/main/webapp/queueConsumers.jsp
+++ b/activemq-web-console/src/main/webapp/queueConsumers.jsp
@@ -14,7 +14,7 @@
See the License for the specific language governing permissions and
limitations under the License.
--%>
-
+<%-- Workaround for https://ops4j1.jira.com/browse/PAXWEB-1070 --%>
<%@include file="WEB-INF/jspf/headertags.jspf" %>
diff --git a/activemq-web-console/src/main/webapp/queueGraph.jsp b/activemq-web-console/src/main/webapp/queueGraph.jsp
index 4998b7874b..ac8b7806a0 100644
--- a/activemq-web-console/src/main/webapp/queueGraph.jsp
+++ b/activemq-web-console/src/main/webapp/queueGraph.jsp
@@ -14,7 +14,7 @@
See the License for the specific language governing permissions and
limitations under the License.
--%>
-
+<%-- Workaround for https://ops4j1.jira.com/browse/PAXWEB-1070 --%>
<%@include file="WEB-INF/jspf/headertags.jspf" %>
diff --git a/activemq-web-console/src/main/webapp/queueProducers.jsp b/activemq-web-console/src/main/webapp/queueProducers.jsp
index 0a460e9b39..e30bf298a0 100644
--- a/activemq-web-console/src/main/webapp/queueProducers.jsp
+++ b/activemq-web-console/src/main/webapp/queueProducers.jsp
@@ -14,7 +14,7 @@
See the License for the specific language governing permissions and
limitations under the License.
--%>
-
+<%-- Workaround for https://ops4j1.jira.com/browse/PAXWEB-1070 --%>
<%@include file="WEB-INF/jspf/headertags.jspf" %>
diff --git a/activemq-web-console/src/main/webapp/queues.jsp b/activemq-web-console/src/main/webapp/queues.jsp
index 59d86433a3..4a1844eac9 100644
--- a/activemq-web-console/src/main/webapp/queues.jsp
+++ b/activemq-web-console/src/main/webapp/queues.jsp
@@ -14,7 +14,7 @@
See the License for the specific language governing permissions and
limitations under the License.
--%>
-
+<%-- Workaround for https://ops4j1.jira.com/browse/PAXWEB-1070 --%>
<%@include file="WEB-INF/jspf/headertags.jspf" %>
diff --git a/activemq-web-console/src/main/webapp/scheduled.jsp b/activemq-web-console/src/main/webapp/scheduled.jsp
index 5e6a9750c3..cac68c3992 100644
--- a/activemq-web-console/src/main/webapp/scheduled.jsp
+++ b/activemq-web-console/src/main/webapp/scheduled.jsp
@@ -14,7 +14,7 @@
See the License for the specific language governing permissions and
limitations under the License.
--%>
-
+<%-- Workaround for https://ops4j1.jira.com/browse/PAXWEB-1070 --%>
<%@include file="WEB-INF/jspf/headertags.jspf" %>
diff --git a/activemq-web-console/src/main/webapp/send.jsp b/activemq-web-console/src/main/webapp/send.jsp
index de84116c68..9c095e908e 100644
--- a/activemq-web-console/src/main/webapp/send.jsp
+++ b/activemq-web-console/src/main/webapp/send.jsp
@@ -14,7 +14,7 @@
See the License for the specific language governing permissions and
limitations under the License.
--%>
-
+<%-- Workaround for https://ops4j1.jira.com/browse/PAXWEB-1070 --%>
<%@include file="WEB-INF/jspf/headertags.jspf" %>
diff --git a/activemq-web-console/src/main/webapp/slave.jsp b/activemq-web-console/src/main/webapp/slave.jsp
index 4ef058a829..1b17fbe8bd 100644
--- a/activemq-web-console/src/main/webapp/slave.jsp
+++ b/activemq-web-console/src/main/webapp/slave.jsp
@@ -14,7 +14,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
+<%-- Workaround for https://ops4j1.jira.com/browse/PAXWEB-1070 --%>
<%@include file="WEB-INF/jspf/headertags.jspf" %>
diff --git a/activemq-web-console/src/main/webapp/subscribers.jsp b/activemq-web-console/src/main/webapp/subscribers.jsp
index 8c057b574e..97f2bfe48a 100644
--- a/activemq-web-console/src/main/webapp/subscribers.jsp
+++ b/activemq-web-console/src/main/webapp/subscribers.jsp
@@ -14,7 +14,7 @@
See the License for the specific language governing permissions and
limitations under the License.
--%>
-
+<%-- Workaround for https://ops4j1.jira.com/browse/PAXWEB-1070 --%>
<%@include file="WEB-INF/jspf/headertags.jspf" %>
diff --git a/activemq-web-console/src/main/webapp/topicProducers.jsp b/activemq-web-console/src/main/webapp/topicProducers.jsp
index ca4d3b5cc1..fcc10ce9af 100644
--- a/activemq-web-console/src/main/webapp/topicProducers.jsp
+++ b/activemq-web-console/src/main/webapp/topicProducers.jsp
@@ -14,7 +14,7 @@
See the License for the specific language governing permissions and
limitations under the License.
--%>
-
+<%-- Workaround for https://ops4j1.jira.com/browse/PAXWEB-1070 --%>
<%@include file="WEB-INF/jspf/headertags.jspf" %>
diff --git a/activemq-web-console/src/main/webapp/topicSubscribers.jsp b/activemq-web-console/src/main/webapp/topicSubscribers.jsp
index 2fa5fbef84..2b5027f60d 100644
--- a/activemq-web-console/src/main/webapp/topicSubscribers.jsp
+++ b/activemq-web-console/src/main/webapp/topicSubscribers.jsp
@@ -14,7 +14,7 @@
See the License for the specific language governing permissions and
limitations under the License.
--%>
-
+<%-- Workaround for https://ops4j1.jira.com/browse/PAXWEB-1070 --%>
<%@include file="WEB-INF/jspf/headertags.jspf" %>
diff --git a/activemq-web-console/src/main/webapp/topics.jsp b/activemq-web-console/src/main/webapp/topics.jsp
index cf35bbbe75..d2e0a6de8c 100644
--- a/activemq-web-console/src/main/webapp/topics.jsp
+++ b/activemq-web-console/src/main/webapp/topics.jsp
@@ -14,7 +14,7 @@
See the License for the specific language governing permissions and
limitations under the License.
--%>
-
+<%-- Workaround for https://ops4j1.jira.com/browse/PAXWEB-1070 --%>
<%@include file="WEB-INF/jspf/headertags.jspf" %>
diff --git a/activemq-web-console/src/main/webapp/xml/queues.jsp b/activemq-web-console/src/main/webapp/xml/queues.jsp
index faa67ca70f..d9935b7ab8 100644
--- a/activemq-web-console/src/main/webapp/xml/queues.jsp
+++ b/activemq-web-console/src/main/webapp/xml/queues.jsp
@@ -15,6 +15,8 @@
See the License for the specific language governing permissions and
limitations under the License.
--%>
+<%-- Workaround for https://ops4j1.jira.com/browse/PAXWEB-1070 --%>
+<%@include file="../WEB-INF/jspf/headertags.jspf" %>
">
diff --git a/activemq-web-console/src/main/webapp/xml/subscribers.jsp b/activemq-web-console/src/main/webapp/xml/subscribers.jsp
index cc797950b8..774a4a10c0 100644
--- a/activemq-web-console/src/main/webapp/xml/subscribers.jsp
+++ b/activemq-web-console/src/main/webapp/xml/subscribers.jsp
@@ -15,6 +15,8 @@
See the License for the specific language governing permissions and
limitations under the License.
--%>
+<%-- Workaround for https://ops4j1.jira.com/browse/PAXWEB-1070 --%>
+<%@include file="../WEB-INF/jspf/headertags.jspf" %>
"
diff --git a/activemq-web-console/src/main/webapp/xml/topics.jsp b/activemq-web-console/src/main/webapp/xml/topics.jsp
index b3efc1513d..a967b1f9a8 100644
--- a/activemq-web-console/src/main/webapp/xml/topics.jsp
+++ b/activemq-web-console/src/main/webapp/xml/topics.jsp
@@ -15,6 +15,8 @@
See the License for the specific language governing permissions and
limitations under the License.
--%>
+<%-- Workaround for https://ops4j1.jira.com/browse/PAXWEB-1070 --%>
+<%@include file="../WEB-INF/jspf/headertags.jspf" %>
">