diff --git a/opennms-webapp/src/main/webapp/WEB-INF/jsp/element/nodeList.jsp b/opennms-webapp/src/main/webapp/WEB-INF/jsp/element/nodeList.jsp
index b118579c98c8..698432283991 100644
--- a/opennms-webapp/src/main/webapp/WEB-INF/jsp/element/nodeList.jsp
+++ b/opennms-webapp/src/main/webapp/WEB-INF/jsp/element/nodeList.jsp
@@ -35,6 +35,7 @@
org.opennms.netmgt.model.monitoringLocations.OnmsMonitoringLocation"%>
<%@ page import="com.google.common.base.Strings" %>
+<%@ page import="org.opennms.core.utils.WebSecurityUtils" %>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
<%@ taglib prefix="element" tagdir="/WEB-INF/tags/element" %>
@@ -106,11 +107,11 @@
for (OnmsMonitoringLocation monitoringLocation : monitoringLocations) {
if (selectedMonitoringLocation.equals(monitoringLocation.getLocationName())) {
%>
-
+
<%
} else {
%>
-
+
<%
}
}
diff --git a/opennms-webapp/src/main/webapp/admin/discovery/add-er.jsp b/opennms-webapp/src/main/webapp/admin/discovery/add-er.jsp
index c7c1fc75d047..00401c9eddc8 100644
--- a/opennms-webapp/src/main/webapp/admin/discovery/add-er.jsp
+++ b/opennms-webapp/src/main/webapp/admin/discovery/add-er.jsp
@@ -41,6 +41,7 @@
org.opennms.web.admin.discovery.ActionDiscoveryServlet,
org.opennms.web.admin.discovery.DiscoveryScanServlet
"%>
+<%@ page import="org.opennms.core.utils.WebSecurityUtils" %>
<%
response.setDateHeader("Expires", 0);
response.setHeader("Pragma", "no-cache");
@@ -134,7 +135,7 @@ function doAddExcludeRange(){
diff --git a/opennms-webapp/src/main/webapp/admin/discovery/add-ir.jsp b/opennms-webapp/src/main/webapp/admin/discovery/add-ir.jsp
index 5ca2308bb127..1b3661467537 100644
--- a/opennms-webapp/src/main/webapp/admin/discovery/add-ir.jsp
+++ b/opennms-webapp/src/main/webapp/admin/discovery/add-ir.jsp
@@ -43,6 +43,7 @@
org.opennms.web.admin.discovery.ActionDiscoveryServlet,
org.opennms.web.admin.discovery.DiscoveryScanServlet
"%>
+<%@ page import="org.opennms.core.utils.WebSecurityUtils" %>
<%
response.setDateHeader("Expires", 0);
response.setHeader("Pragma", "no-cache");
@@ -180,7 +181,7 @@ function doAddIncludeRange(){
@@ -190,7 +191,7 @@ function doAddIncludeRange(){
diff --git a/opennms-webapp/src/main/webapp/admin/discovery/add-specific.jsp b/opennms-webapp/src/main/webapp/admin/discovery/add-specific.jsp
index 395bacf577cc..ff1b0f268bf0 100644
--- a/opennms-webapp/src/main/webapp/admin/discovery/add-specific.jsp
+++ b/opennms-webapp/src/main/webapp/admin/discovery/add-specific.jsp
@@ -44,6 +44,7 @@
org.opennms.web.admin.discovery.DiscoveryServletConstants,
org.opennms.web.admin.discovery.ActionDiscoveryServlet
"%>
+<%@ page import="org.opennms.core.utils.WebSecurityUtils" %>
<%
response.setDateHeader("Expires", 0);
response.setHeader("Pragma", "no-cache");
@@ -162,7 +163,7 @@ function doAddSpecific(){
diff --git a/opennms-webapp/src/main/webapp/admin/discovery/add-url.jsp b/opennms-webapp/src/main/webapp/admin/discovery/add-url.jsp
index 4b536f04ca55..8e804f5c2861 100644
--- a/opennms-webapp/src/main/webapp/admin/discovery/add-url.jsp
+++ b/opennms-webapp/src/main/webapp/admin/discovery/add-url.jsp
@@ -44,6 +44,7 @@
org.opennms.web.admin.discovery.ActionDiscoveryServlet,
org.opennms.web.admin.discovery.DiscoveryScanServlet
"%>
+<%@ page import="org.opennms.core.utils.WebSecurityUtils" %>
<%
response.setDateHeader("Expires", 0);
response.setHeader("Pragma", "no-cache");
@@ -146,7 +147,7 @@ function doAddIncludeUrl() {
@@ -156,7 +157,7 @@ function doAddIncludeUrl() {
diff --git a/opennms-webapp/src/main/webapp/admin/discovery/edit-config.jsp b/opennms-webapp/src/main/webapp/admin/discovery/edit-config.jsp
index c9ee2a1f122e..02169560296c 100644
--- a/opennms-webapp/src/main/webapp/admin/discovery/edit-config.jsp
+++ b/opennms-webapp/src/main/webapp/admin/discovery/edit-config.jsp
@@ -240,7 +240,7 @@ for (Requisition requisition : reqAccessService.getRequisitions()) {
diff --git a/opennms-webapp/src/main/webapp/admin/discovery/edit-scan.jsp b/opennms-webapp/src/main/webapp/admin/discovery/edit-scan.jsp
index 137c5669d0a2..3b3db161ed0d 100644
--- a/opennms-webapp/src/main/webapp/admin/discovery/edit-scan.jsp
+++ b/opennms-webapp/src/main/webapp/admin/discovery/edit-scan.jsp
@@ -44,6 +44,7 @@
org.opennms.web.admin.discovery.DiscoveryServletConstants,
org.opennms.web.admin.discovery.DiscoveryScanServlet"
%>
+<%@ page import="org.opennms.core.utils.WebSecurityUtils" %>
<%
response.setDateHeader("Expires", 0);
response.setHeader("Pragma", "no-cache");
@@ -207,7 +208,7 @@ for (Requisition requisition : reqAccessService.getRequisitions()) {
@@ -215,7 +216,7 @@ for (Requisition requisition : reqAccessService.getRequisitions()) {
diff --git a/opennms-webapp/src/main/webapp/asset/index.jsp b/opennms-webapp/src/main/webapp/asset/index.jsp
index 641c75c0545c..2b6c8dbf5377 100644
--- a/opennms-webapp/src/main/webapp/asset/index.jsp
+++ b/opennms-webapp/src/main/webapp/asset/index.jsp
@@ -37,6 +37,7 @@
org.opennms.web.element.NetworkElementFactory
"
%>
+<%@ page import="org.opennms.core.utils.WebSecurityUtils" %>
<%!
protected AssetModel model;
@@ -114,13 +115,13 @@
diff --git a/opennms-webapp/src/main/webapp/asset/modify.jsp b/opennms-webapp/src/main/webapp/asset/modify.jsp
index 58ebca035ee0..52e4a0f9e056 100644
--- a/opennms-webapp/src/main/webapp/asset/modify.jsp
+++ b/opennms-webapp/src/main/webapp/asset/modify.jsp
@@ -109,7 +109,7 @@
<%-- Standard fields with typeahead suggestions --%>
<%-- Password fields --%>
<%-- Set `autocomplete="new-password"` to prevent autocomplete.
diff --git a/opennms-webapp/src/main/webapp/element/index.jsp b/opennms-webapp/src/main/webapp/element/index.jsp
index 9d2b602827c2..79fd060ec3ae 100644
--- a/opennms-webapp/src/main/webapp/element/index.jsp
+++ b/opennms-webapp/src/main/webapp/element/index.jsp
@@ -36,6 +36,7 @@
org.opennms.web.element.*,
org.opennms.web.asset.*,
org.opennms.netmgt.model.monitoringLocations.OnmsMonitoringLocation"%>
+<%@ page import="org.opennms.core.utils.WebSecurityUtils" %>
<%!
protected AssetModel model;
@@ -150,7 +151,7 @@