diff --git a/apps/i2ptunnel/jsp/editServer.jsi b/apps/i2ptunnel/jsp/editServer.jsi
index 3e24cd48da..d744fb10ee 100644
--- a/apps/i2ptunnel/jsp/editServer.jsi
+++ b/apps/i2ptunnel/jsp/editServer.jsi
@@ -422,44 +422,47 @@
         </tr><tr>
             <td colspan="2">
 <%
-                   String curEncryptMode = editBean.getEncryptMode(curTunnel);
+                String curEncryptMode = editBean.getEncryptMode(curTunnel);
+                boolean canChangeEncType = editBean.canChangeEncType(curTunnel);
+                String cdisabled = canChangeEncType ? "" : " disabled=\"disabled\" ";
 %>
                 <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\"" : "")%> >
+                <option title="<%=intl._t("Allow all clients to connect to this service")%>" value="0" <%=(curEncryptMode.equals("0") ? " selected=\"selected\"" : cdisabled)%> >
                     <%=intl._t("Disable")%></option>
 <%
                 if (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\"" : cdisabled)%> >
                     <%=intl._t("Disable")%> (LS2)</option>
 <%
                 } // mode = 10
 %>
-                <option title="<%=intl._t("Send key to all users.")%>" value="1" <%=(curEncryptMode.equals("1") ? " selected=\"selected\"" : "")%> >
+                <option title="<%=intl._t("Send key to all users.")%>" value="1" <%=(curEncryptMode.equals("1") ? " selected=\"selected\"" : cdisabled)%> >
                     <%=intl._t("Encrypted")%> (AES)</option>
 <%
                 int curSigType = editBean.getSigType(curTunnel, tunnelType);
                 boolean allowBlinding = (curSigType == 7 || curSigType == 11);
+                String bdisabled = (allowBlinding && canChangeEncType) ? "" : " disabled=\"disabled\" ";
                 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\"" : bdisabled)%> >
                     <%=intl._t("Blinded")%></option>
 <%
                      if (true /* editBean.isAdvanced() */) {
 %>
-                <option title="<%=intl._t("Send password to all users.")%>" value="3" <%=(curEncryptMode.equals("3") ? " selected=\"selected\"" : "")%> >
+                <option title="<%=intl._t("Send password to all users.")%>" value="3" <%=(curEncryptMode.equals("3") ? " selected=\"selected\"" : bdisabled)%> >
                     <%=intl._t("Blinded with lookup password")%></option>
-                <option title="<%=intl._t("Send key to all users.")%>" value="4" <%=(curEncryptMode.equals("4") ? " selected=\"selected\"" : "")%> >
+                <option title="<%=intl._t("Send key to all users.")%>" value="4" <%=(curEncryptMode.equals("4") ? " selected=\"selected\"" : bdisabled)%> >
                     <%=intl._t("Encrypted")%> (PSK)</option>
-                <option title="<%=intl._t("Send key and password to all users.")%>" value="5" <%=(curEncryptMode.equals("5") ? " selected=\"selected\"" : "")%> >
+                <option title="<%=intl._t("Send key and password to all users.")%>" value="5" <%=(curEncryptMode.equals("5") ? " selected=\"selected\"" : bdisabled)%> >
                     <%=intl._t("Encrypted with lookup password")%> (PSK)</option>
-                <option title="<%=intl._t("Send individual key to each user.")%>" value="6" <%=(curEncryptMode.equals("6") ? " selected=\"selected\"" : "")%> >
+                <option title="<%=intl._t("Send individual key to each user.")%>" value="6" <%=(curEncryptMode.equals("6") ? " selected=\"selected\"" : bdisabled)%> >
                     <%=intl._t("Encrypted with per-user key")%> (PSK)</option>
-                <option title="<%=intl._t("Send individual key to each user.") + ' '%> <%=intl._t("Send password to all users.")%>" value="7" <%=(curEncryptMode.equals("7") ? " selected=\"selected\"" : "")%> >
+                <option title="<%=intl._t("Send individual key to each user.") + ' '%> <%=intl._t("Send password to all users.")%>" value="7" <%=(curEncryptMode.equals("7") ? " selected=\"selected\"" : bdisabled)%> >
                     <%=intl._t("Encrypted with lookup password and per-user key")%> (PSK)</option>
-                <option title="<%=intl._t("Enter key from each user.")%>" value="8" <%=(curEncryptMode.equals("8") ? " selected=\"selected\"" : "")%> >
+                <option title="<%=intl._t("Enter key from each user.")%>" value="8" <%=(curEncryptMode.equals("8") ? " selected=\"selected\"" : bdisabled)%> >
                     <%=intl._t("Encrypted with per-user key")%> (DH)</option>
-                <option title="<%=intl._t("Enter key from each user.") + ' '%> <%=intl._t("Send password to all users.")%>" value="9" <%=(curEncryptMode.equals("9") ? " selected=\"selected\"" : "")%> >
+                <option title="<%=intl._t("Enter key from each user.") + ' '%> <%=intl._t("Send password to all users.")%>" value="9" <%=(curEncryptMode.equals("9") ? " selected=\"selected\"" : bdisabled)%> >
                     <%=intl._t("Encrypted with lookup password and per-user key")%> (DH)</option>
 <%
                      } // isAdvanced()
@@ -493,7 +496,7 @@
 <%
                 if (allowBlinding /* && editBean.isAdvanced() */) {
 %>
-                <input type="password" name="nofilter_blindedPassword" title="<%=intl._t("Set password required to access this service")%>" value="<%=editBean.getBlindedPassword(curTunnel)%>" class="freetext password" />
+                <input type="password" name="nofilter_blindedPassword" title="<%=intl._t("Set password required to access this service")%>" value="<%=editBean.getBlindedPassword(curTunnel)%>" class="freetext password" <%=bdisabled%>/>
 <%
                 } // allowBlinding
 %>