diff --git a/apps/i2ptunnel/jsp/editClient.jsi b/apps/i2ptunnel/jsp/editClient.jsi
index e55d71af9..70874a1a6 100644
--- a/apps/i2ptunnel/jsp/editClient.jsi
+++ b/apps/i2ptunnel/jsp/editClient.jsi
@@ -90,7 +90,7 @@
                        }
                       String phelp = intl._t("Specify the local port this service should be accessible from");
                       String ptext = canChangePort ? phelp : bStopFirst;
-                      String pdisabled = canChangePort ? "" : " disabled=\"disabled\" ";
+                      String pdisabled = canChangePort ? "" : " readonly=\"readonly\" ";
 %>
                 <input type="text" size="6" maxlength="5" name="port" title="<%=ptext%>" value="<%=editBean.getClientPort(curTunnel)%>" class="freetext port" placeholder="required" <%=pdisabled%>/>
             </td>
@@ -125,6 +125,8 @@
                         out.write('\"');
                         if (ifc.equals(clientInterface))
                             out.write(" selected=\"selected\"");
+                        else if (!canChangePort)
+                            out.write(" disabled=\"disabled\"");
                         out.write('>');
                         out.write(ifc);
                         out.write("</option>\n");
diff --git a/apps/i2ptunnel/jsp/editServer.jsi b/apps/i2ptunnel/jsp/editServer.jsi
index 926736e6c..c731cb40f 100644
--- a/apps/i2ptunnel/jsp/editServer.jsi
+++ b/apps/i2ptunnel/jsp/editServer.jsi
@@ -98,7 +98,7 @@
                        String asphelp = intl._t("Specify the local port this service should be accessible from");
                        String bsphelp = intl._t("Specify the port the server is running on");
                        String ptext = canChangePort ? (isStreamrServer ? asphelp : bsphelp) : stopFirst;
-                       String pdisabled = canChangePort ? "" : " disabled=\"disabled\" ";
+                       String pdisabled = canChangePort ? "" : " readonly=\"readonly\" ";
 %>
                 <input type="text" size="6" maxlength="5" id="targetPort" name="targetPort" title="<%=ptext%>" value="<%=editBean.getTargetPort(curTunnel)%>" class="freetext port" placeholder="required" <%=pdisabled%>/>
 <%          if (!isStreamrServer) { %>
@@ -135,7 +135,7 @@
                        String esphelp = intl._t("Listening interface (IP address) for client access (normally 127.0.0.1)");
                        String fsphelp = canChangePort ? esphelp : stopFirst;
 %>
-                <select id="reachableBy" name="reachableBy" title="<%=fsphelp%>" class="selectbox" <%=pdisabled%>>
+                <select id="reachableBy" name="reachableBy" title="<%=fsphelp%>" class="selectbox">
 <%
                     String clientInterface = editBean.getClientInterface(curTunnel);
                     for (String ifc : editBean.interfaceSet()) {
@@ -144,6 +144,8 @@
                         out.write('\"');
                         if (ifc.equals(clientInterface))
                             out.write(" selected=\"selected\"");
+                        else if (!canChangePort)
+                            out.write(" disabled=\"disabled\"");
                         out.write('>');
                         out.write(ifc);
                         out.write("</option>\n");
@@ -190,7 +192,7 @@
                        }
                        String htext = intl._t("Path to Private Key File");
                        String dtext = canChangeDest ? htext : stopFirst;
-                       String ddisabled = canChangeDest ? "" : " disabled=\"disabled\" ";
+                       String ddisabled = canChangeDest ? "" : " readonly=\"readonly\" ";
 %>
                 <input type="text" size="30" id="privKeyFile" name="privKeyFile" title="<%=dtext%>" value="<%=editBean.getPrivateKeyFile(curTunnel)%>" class="freetext" placeholder="required" <%=ddisabled%>/>
             </td>
@@ -473,6 +475,7 @@
                 int curSigType = editBean.getSigType(curTunnel, tunnelType);
                 boolean allowBlinding = (curSigType == 7 || curSigType == 11);
                 String bdisabled = (allowBlinding && canChangeEncType) ? "" : " disabled=\"disabled\" ";
+                String bidisabled = (allowBlinding && canChangeEncType) ? "" : " readonly=\"readonly\" ";
                 if (allowBlinding) {
 %>
                 <option title="<%=intl._t("Prevents server discovery by floodfills")%>" value="2" <%=(curEncryptMode.equals("2") ? " selected=\"selected\"" : bdisabled)%> >
@@ -530,7 +533,7 @@
                                       intl._t("Set password required to access this service") :
                                       stopFirst) + '"';
 %>
-                <input type="password" name="nofilter_blindedPassword" <%=pwTitle%> value="<%=editBean.getBlindedPassword(curTunnel)%>" class="freetext password" <%=bdisabled%>/>
+                <input type="password" name="nofilter_blindedPassword" <%=pwTitle%> value="<%=editBean.getBlindedPassword(curTunnel)%>" class="freetext password" <%=bidisabled%>/>
 <%
                 } // allowBlinding
 %>
diff --git a/history.txt b/history.txt
index 8635089c0..60f04af55 100644
--- a/history.txt
+++ b/history.txt
@@ -1,3 +1,12 @@
+2020-05-12 zzz
+ * i2ptunnel:
+   - Fix data loss in forms
+   - Encrypt keys in forms
+
+2020-05-11 zzz
+ * Console: Fix delete confirmation dialog on /configplugins
+ * Console, i2psnark, i2ptunnel: Refactor js, stricter CSP
+
 2020-05-10 zzz
  * i2psnark: Support file paths in add form
 
@@ -6,6 +15,7 @@
 
 2020-05-08 zzz
  * Build: Use git revisions when available
+ * i2ptunnel: Disable changing some options while running
  * Router: FloodfillPeerSelector cleanup (ticket #2694)
 
 2020-05-07 zzz
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index 80cfb9c84..5b1ba79e3 100644
--- a/router/java/src/net/i2p/router/RouterVersion.java
+++ b/router/java/src/net/i2p/router/RouterVersion.java
@@ -18,7 +18,7 @@ public class RouterVersion {
     /** deprecated */
     public final static String ID = "Monotone";
     public final static String VERSION = CoreVersion.VERSION;
-    public final static long BUILD = 18;
+    public final static long BUILD = 19;
 
     /** for example "-test" */
     public final static String EXTRA = "";