diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/ui/GeneralHelper.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/ui/GeneralHelper.java
index 8b4b1a912..f3ef31409 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/ui/GeneralHelper.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/ui/GeneralHelper.java
@@ -647,8 +647,12 @@ public class GeneralHelper {
 
     public String getFilterDefinition(int tunnel) {
         TunnelController tunnelController = getController(tunnel);
-        String filter = tunnelController.getFilter();
-        return filter == null ? "" : filter;
+        if (tunnelController != null) {
+            String filter = tunnelController.getFilter();
+            if (filter != null)
+                return filter;
+        }
+        return "";
     }
     
     public String getJumpList(int tunnel) {
diff --git a/apps/i2ptunnel/jsp/editClient.jsi b/apps/i2ptunnel/jsp/editClient.jsi
index 74e89e028..454ca7e7d 100644
--- a/apps/i2ptunnel/jsp/editClient.jsi
+++ b/apps/i2ptunnel/jsp/editClient.jsi
@@ -528,11 +528,12 @@
                     <label title="<%=intl._t("This is the default, recommended option")%>"><input value="7" type="radio" name="sigType" <%=disabled%> <%=(currentSigType==7 ? " checked=\"checked\"" : "")%> class="tickbox" />
                     Ed25519-SHA-512</label>
                 </span>
+<%
+              }   // isAvailable
+%>
             </td>
         </tr>
 <%
-              }   // isAvailable
-
             } // isAdvanced
 
             if ("httpclient".equals(tunnelType) || "connectclient".equals(tunnelType) || "sockstunnel".equals(tunnelType) || "socksirctunnel".equals(tunnelType)) {
diff --git a/apps/i2ptunnel/jsp/editServer.jsi b/apps/i2ptunnel/jsp/editServer.jsi
index 2aa3dceaf..30b0d0538 100644
--- a/apps/i2ptunnel/jsp/editServer.jsi
+++ b/apps/i2ptunnel/jsp/editServer.jsi
@@ -741,6 +741,12 @@
                     <label title="<%=intl._t("This is the default, recommended option")%>"><input value="7" type="radio" id="startOnLoad" name="sigType" <%=disabled%> <%=(currentSigType==7 ? " checked=\"checked\"" : "")%> class="tickbox" />
                     Ed25519-SHA-512</label>
                 </span>
+<%            }
+              if (editBean.isSigTypeAvailable(11)) { %>
+                <span class="multiOption">
+                    <label title="<%=intl._t("Experimental")%>"><input value="11" type="radio" id="startOnLoad" name="sigType" <%=disabled%> <%=(currentSigType==11 ? " checked=\"checked\"" : "")%> class="tickbox" />
+                    Red25519-SHA-512</label>
+                </span>
 <%            }   // isAvailable
 %>
             </td>