diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigClientsHandler.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigClientsHandler.java
index 5acdf313b..aac87fbfb 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigClientsHandler.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigClientsHandler.java
@@ -104,7 +104,12 @@ public class ConfigClientsHandler extends FormHandler {
                 appnum = Integer.parseInt(app);
             } catch (NumberFormatException nfe) {}
             if (appnum >= 0) {
-                deleteClient(appnum);
+                if (_context.getBooleanProperty(ConfigClientsHelper.PROP_ENABLE_CLIENT_CHANGE) ||
+                    isAdvanced()) {
+                    deleteClient(appnum);
+                } else {
+                    addFormError("Delete client disabled");
+                }
             } else if (pluginsEnabled) {
                 try {
                     PluginStarter.stopPlugin(_context, app);
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigClientsHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigClientsHelper.java
index 843fef737..4d0adeca6 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigClientsHelper.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigClientsHelper.java
@@ -141,7 +141,7 @@ public class ConfigClientsHelper extends HelperBase {
                        // show stop button
                        showStop,
                        // show delete button, show start button
-                       !isConsole, showStart);
+                       allowEdit && !isConsole, showStart);
         }
         
         if (allowEdit && "new".equals(_edit))
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index a411b0099..87e5bffca 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 = 0;
+    public final static long BUILD = 1;
 
     /** for example "-test" */
     public final static String EXTRA = "";