diff --git a/apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigClientsHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigClientsHelper.java
index 8e07d426a3..2cbca64f64 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigClientsHelper.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigClientsHelper.java
@@ -401,9 +401,7 @@ public class ConfigClientsHelper extends HelperBase {
         }
         if (showDeleteButton && (!edit) && !ro) {
             buf.append("<button type=\"submit\" title=\"").append(_t("Delete")).append("\" class=\"control delete\" name=\"action\" value=\"Delete ").append(index)
-               .append("\" onclick=\"if (!confirm('")
-               .append(_t("Are you sure you want to delete {0}?", _t(escapedName)))
-               .append("')) { return false; }\">")
+               .append("\" client=\"").append(_t(escapedName)).append("\">")
                .append(_t("Delete")).append("<span class=hide> ").append(index).append("</span></button>");
         }
         buf.append("</td><td align=\"left\">");
diff --git a/apps/routerconsole/jsp/configclients.jsp b/apps/routerconsole/jsp/configclients.jsp
index ace704112c..45bafda37d 100644
--- a/apps/routerconsole/jsp/configclients.jsp
+++ b/apps/routerconsole/jsp/configclients.jsp
@@ -3,7 +3,6 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html><head>
 <%@include file="css.jsi" %>
-<%@include file="csp-unsafe.jsi" %>
 <%=intl.title("config clients")%>
 <style type='text/css'>
 button span.hide{
@@ -12,6 +11,10 @@ button span.hide{
 input.default { width: 1px; height: 1px; visibility: hidden; }
 </style>
 <%@include file="summaryajax.jsi" %>
+<script nonce="<%=cspNonce%>" type="text/javascript">
+  var deleteMessage = "<%=intl._t("Are you sure you want to delete {0}?")%>";
+</script>
+<script src="/js/configclients.js?<%=net.i2p.CoreVersion.VERSION%>" type="text/javascript"></script>
 </head><body>
 <%@include file="summary.jsi" %>
 <jsp:useBean class="net.i2p.router.web.helpers.ConfigClientsHelper" id="clientshelper" scope="request" />
diff --git a/apps/routerconsole/jsp/configplugins.jsp b/apps/routerconsole/jsp/configplugins.jsp
index c6bb9ca509..46b1be05c1 100644
--- a/apps/routerconsole/jsp/configplugins.jsp
+++ b/apps/routerconsole/jsp/configplugins.jsp
@@ -11,6 +11,10 @@ button span.hide{
 input.default { width: 1px; height: 1px; visibility: hidden; }
 </style>
 <%@include file="summaryajax.jsi" %>
+<script nonce="<%=cspNonce%>" type="text/javascript">
+  var deleteMessage = "<%=intl._t("Are you sure you want to delete {0}?")%>";
+</script>
+<script src="/js/configclients.js?<%=net.i2p.CoreVersion.VERSION%>" type="text/javascript"></script>
 </head><body>
 <%@include file="summary.jsi" %>
 <jsp:useBean class="net.i2p.router.web.helpers.ConfigClientsHelper" id="clientshelper" scope="request" />
diff --git a/apps/routerconsole/jsp/js/configclients.js b/apps/routerconsole/jsp/js/configclients.js
new file mode 100644
index 0000000000..657e29f820
--- /dev/null
+++ b/apps/routerconsole/jsp/js/configclients.js
@@ -0,0 +1,23 @@
+function init()
+{
+	var buttons = document.getElementsByClassName("delete");
+	for(index = 0; index < buttons.length; index++)
+	{
+		var button = buttons[index];
+		addClickHandler(button);
+	}
+}
+
+function addClickHandler(elem)
+{
+	elem.addEventListener("click", function() {
+              if (!confirm(deleteMessage.replace("{0}", elem.getAttribute("client")))) {
+                  event.preventDefault();
+                  return false;
+              }
+        });
+}
+
+document.addEventListener("DOMContentLoaded", function() {
+    init();
+}, true);
diff --git a/apps/routerconsole/jsp/js/configstats.js b/apps/routerconsole/jsp/js/configstats.js
index bbfd27124b..81bf111510 100644
--- a/apps/routerconsole/jsp/js/configstats.js
+++ b/apps/routerconsole/jsp/js/configstats.js
@@ -62,4 +62,7 @@ function toggleAll(category)
 		}
 	}
 }
-window.addEventListener("load", init);
+
+document.addEventListener("DOMContentLoaded", function() {
+    init();
+}, true);
