diff --git a/apps/i2ptunnel/jsp/editClient.jsi b/apps/i2ptunnel/jsp/editClient.jsi
index 59a410e60..2ece40a25 100644
--- a/apps/i2ptunnel/jsp/editClient.jsi
+++ b/apps/i2ptunnel/jsp/editClient.jsi
@@ -497,44 +497,36 @@
             </th>
         </tr><tr>
             <td colspan="2">
-                <span class="multiOption">
-                    <label title="<%=intl._t("Legacy option (deprecated), provided for backward compatibility")%>"><input value="0" type="radio" name="sigType" <%=disabled%> <%=(currentSigType==0 ? " checked=\"checked\"" : "")%> class="tickbox" />
-                    DSA-SHA1</label>
-                </span>
+                <select id="sigType" name="sigType" class="selectbox">
+                    <option title="<%=intl._t("Legacy option (deprecated), provided for backward compatibility")%>" value="0" <%=(currentSigType==0 ? " selected=\"selected\"" : disabled)%> >
+                    DSA-SHA1</option>
 <%
               if (editBean.isSigTypeAvailable(1)) {
 %>
-                <span class="multiOption">
-                    <label><input value="1" type="radio" name="sigType" <%=disabled%> <%=(currentSigType==1 ? " checked=\"checked\"" : "")%> class="tickbox" />
-                    ECDSA-P256</label>
-                </span>
+                    <option value="1" <%=(currentSigType==1 ? " selected=\"selected\"" : disabled)%> >
+                    ECDSA-P256</option>
 <%
               }
               if (editBean.isSigTypeAvailable(2)) {
 %>
-                <span class="multiOption">
-                    <label><input value="2" type="radio" name="sigType" <%=disabled%> <%=(currentSigType==2 ? " checked=\"checked\"" : "")%> class="tickbox" />
-                    ECDSA-P384</label>
-                </span>
+                    <option value="2" <%=(currentSigType==2 ? " selected=\"selected\"" : disabled)%> >
+                    ECDSA-P384</option>
 <%
               }
               if (editBean.isSigTypeAvailable(3)) {
 %>
-                <span class="multiOption">
-                    <label><input value="3" type="radio" name="sigType" <%=disabled%> <%=(currentSigType==3 ? " checked=\"checked\"" : "")%> class="tickbox" />
-                    ECDSA-P521</label>
-                </span>
+                    <option value="3" <%=(currentSigType==3 ? " selected=\"selected\"" : disabled)%> >
+                    ECDSA-P521</option>
 <%
               }
               if (editBean.isSigTypeAvailable(7)) {
 %>
-                <span class="multiOption">
-                    <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>
+                    <option title="<%=intl._t("This is the default, recommended option")%>" value="7" <%=(currentSigType==7 ? " selected=\"selected\"" : disabled)%> >
+                    Ed25519-SHA-512</option>
 <%
               }   // isAvailable
 %>
+                </select>
             </td>
         </tr>
 <%
diff --git a/apps/i2ptunnel/jsp/editServer.jsi b/apps/i2ptunnel/jsp/editServer.jsi
index 7e3c48095..0312a74a9 100644
--- a/apps/i2ptunnel/jsp/editServer.jsi
+++ b/apps/i2ptunnel/jsp/editServer.jsi
@@ -437,45 +437,45 @@
 <%
                    String curEncryptMode = editBean.getEncryptMode(curTunnel);
 %>
-                <select id="encryptMode" name="encryptMode">" class="selectbox">
-                <option title="<%=intl._t("Allow all clients to connect to this service")%>" value="0" <%=(curEncryptMode.equals("0") ? " selected=\"selected\"" : "")%>  />
+                <select id="encryptMode" name="encryptMode" class="selectbox">
+                <option title="<%=intl._t("Allow all clients to connect to this service")%>" value="0" <%=(curEncryptMode.equals("0") ? " selected=\"selected\"" : "")%> >
                     <%=intl._t("Disable")%></option>
 <%
                 if (editBean.isAdvanced() || curEncryptMode.equals("10")) {
 %>
-                <option title="<%=intl._t("Allow all clients to connect to this service")%>" value="10" <%=(curEncryptMode.equals("10") ? " selected=\"selected\"" : "")%>  />
+                <option title="<%=intl._t("Allow all clients to connect to this service")%>" value="10" <%=(curEncryptMode.equals("10") ? " selected=\"selected\"" : "")%> >
                     <%=intl._t("Disable")%> (LS2)</option>
 <%
                 } // isAdvanced()
 %>
-                <option title="<%=intl._t("Only clients with the encryption key will be able to connect")%>" value="1" <%=(curEncryptMode.equals("1") ? " selected=\"selected\"" : "")%>  />
+                <option title="<%=intl._t("Only clients with the encryption key will be able to connect")%>" value="1" <%=(curEncryptMode.equals("1") ? " selected=\"selected\"" : "")%> >
                     <%=intl._t("Encrypted")%></option>
 <%
                 int curSigType = editBean.getSigType(curTunnel, tunnelType);
                 boolean allowBlinding = (curSigType == 7 || curSigType == 11);
                 if (allowBlinding) {
 %>
-                <option title="<%=intl._t("Prevents server discovery by floodfills")%>" value="2" <%=(curEncryptMode.equals("2") ? " selected=\"selected\"" : "")%>  />
+                <option title="<%=intl._t("Prevents server discovery by floodfills")%>" value="2" <%=(curEncryptMode.equals("2") ? " selected=\"selected\"" : "")%> >
                     <%=intl._t("Blinded")%></option>
 <%
                      if (editBean.isAdvanced()) {
 %>
-                <option title="<%=intl._t("Only clients with the password will be able to connect")%>" value="3" <%=(curEncryptMode.equals("3") ? " selected=\"selected\"" : "")%>  />
+                <option title="<%=intl._t("Only clients with the password will be able to connect")%>" value="3" <%=(curEncryptMode.equals("3") ? " selected=\"selected\"" : "")%> >
                     <%=intl._t("Blinded with lookup password")%></option>
 <%
                          // TODO, unimplemented
 %>
-                <option title="<%=intl._t("Only clients with the encryption key will be able to connect")%>" value="4" <%=(curEncryptMode.equals("4") ? " selected=\"selected\"" : "")%>  />
+                <option title="<%=intl._t("Only clients with the encryption key will be able to connect")%>" value="4" <%=(curEncryptMode.equals("4") ? " selected=\"selected\"" : "")%> >
                     <%=intl._t("Blinded with shared key")%></option>
-                <option title="<%=intl._t("Only clients with the password and key will be able to connect")%>" value="5" <%=(curEncryptMode.equals("5") ? " selected=\"selected\"" : "")%>  />
+                <option title="<%=intl._t("Only clients with the password and key will be able to connect")%>" value="5" <%=(curEncryptMode.equals("5") ? " selected=\"selected\"" : "")%> >
                     <%=intl._t("Blinded with lookup password and shared key")%></option>
-                <option title="<%=intl._t("Only clients with the encryption key will be able to connect")%>" value="6" <%=(curEncryptMode.equals("6") ? " selected=\"selected\"" : "")%>  />
+                <option title="<%=intl._t("Only clients with the encryption key will be able to connect")%>" value="6" <%=(curEncryptMode.equals("6") ? " selected=\"selected\"" : "")%> >
                     <%=intl._t("Blinded with per-user key")%> (PSK)</option>
-                <option title="<%=intl._t("Only clients with the password and key will be able to connect")%>" value="7" <%=(curEncryptMode.equals("7") ? " selected=\"selected\"" : "")%>  />
+                <option title="<%=intl._t("Only clients with the password and key will be able to connect")%>" value="7" <%=(curEncryptMode.equals("7") ? " selected=\"selected\"" : "")%> >
                     <%=intl._t("Blinded with lookup password and per-user key")%> (PSK)</option>
-                <option title="<%=intl._t("Only clients with the encryption key will be able to connect")%>" value="8" <%=(curEncryptMode.equals("8") ? " selected=\"selected\"" : "")%>  />
+                <option title="<%=intl._t("Only clients with the encryption key will be able to connect")%>" value="8" <%=(curEncryptMode.equals("8") ? " selected=\"selected\"" : "")%> >
                     <%=intl._t("Blinded with per-user key")%> (DH)</option>
-                <option title="<%=intl._t("Only clients with the password and key will be able to connect")%>" value="9" <%=(curEncryptMode.equals("9") ? " selected=\"selected\"" : "")%>  />
+                <option title="<%=intl._t("Only clients with the password and key will be able to connect")%>" value="9" <%=(curEncryptMode.equals("9") ? " selected=\"selected\"" : "")%> >
                     <%=intl._t("Blinded with lookup password and per-user key")%> (DH)</option>
 <%
                      } // isAdvanced()
@@ -743,41 +743,31 @@
             </th>
         </tr><tr>
             <td colspan="2">
-                <span class="multiOption">
-                    <label title="<%=intl._t("Legacy option (deprecated), provided for backward compatibility")%>"><input value="0" type="radio" id="startOnLoad" name="sigType" <%=disabled%> <%=(currentSigType==0 ? " checked=\"checked\"" : "")%> class="tickbox" />
-                    DSA-SHA1</label>
-                </span>
+                <select id="sigType" name="sigType" class="selectbox">
+                    <option title="<%=intl._t("Legacy option (deprecated), provided for backward compatibility")%>" value="0" <%=(currentSigType==0 ? " selected=\"selected\"" : disabled)%> >
+                    DSA-SHA1</option>
 <%           if (editBean.isSigTypeAvailable(1)) { %>
-                <span class="multiOption">
-                    <label><input value="1" type="radio" id="startOnLoad" name="sigType" <%=disabled%> <%=(currentSigType==1 ? " checked=\"checked\"" : "")%> class="tickbox" />
-                    ECDSA-P256</label>
-                </span>
+                    <option value="1" <%=(currentSigType==1 ? " selected=\"selected\"" : disabled)%> >
+                    ECDSA-P256</option>
 <%            }
               if (editBean.isSigTypeAvailable(2)) { %>
-                <span class="multiOption">
-                    <label><input value="2" type="radio" id="startOnLoad" name="sigType" <%=disabled%> <%=(currentSigType==2 ? " checked=\"checked\"" : "")%> class="tickbox" />
-                    ECDSA-P384</label>
-                </span>
+                    <option value="2" <%=(currentSigType==2 ? " selected=\"selected\"" : disabled)%> >
+                    ECDSA-P384</option>
 <%            }
               if (editBean.isSigTypeAvailable(3)) { %>
-                <span class="multiOption">
-                    <label><input value="3" type="radio" id="startOnLoad" name="sigType" <%=disabled%> <%=(currentSigType==3 ? " checked=\"checked\"" : "")%> class="tickbox" />
-                    ECDSA-P521</label>
-                </span>
+                    <option value="3" <%=(currentSigType==3 ? " selected=\"selected\"" : disabled)%> >
+                    ECDSA-P521</option>
 <%            }
               if (editBean.isSigTypeAvailable(7)) { %>
-                <span class="multiOption">
-                    <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>
+                    <option title="<%=intl._t("This is the default, recommended option")%>" value="7" <%=(currentSigType==7 ? " selected=\"selected\"" : disabled)%> >
+                    Ed25519-SHA-512</option>
 <%            }
               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>
+                    <option title="<%=intl._t("Experimental")%>" value="11" <%=(currentSigType==11 ? " selected=\"selected\"" : disabled)%> >
+                    Red25519-SHA-512</option>
 <%            }   // isAvailable
 %>
+                </select>
             </td>
         </tr>
 <%          } // isAdvanced