diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigRestartBean.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigRestartBean.java
index b8c1f3ca2..2b8817a31 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigRestartBean.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigRestartBean.java
@@ -59,8 +59,12 @@ public class ConfigRestartBean {
                      + "<a href=\"" + urlBase + "?consoleNonce=" + systemNonce + "&amp;action=cancelShutdown\">Cancel restart</a> ";
             }
         } else {
-            return "<a href=\"" + urlBase + "?consoleNonce=" + systemNonce + "&amp;action=restart\" title=\"Graceful restart\">Restart</a> "
-                 + "<a href=\"" + urlBase + "?consoleNonce=" + systemNonce + "&amp;action=shutdown\" title=\"Graceful shutdown\">Shutdown</a>";
+            String shutdown = "<a href=\"" + urlBase + "?consoleNonce=" + systemNonce + "&amp;action=shutdown\" title=\"Graceful shutdown\">Shutdown</a>";
+            if (System.getProperty("wrapper.version") != null)
+                return "<a href=\"" + urlBase + "?consoleNonce=" + systemNonce + "&amp;action=restart\" title=\"Graceful restart\">Restart</a> "
+                       + shutdown;
+            else
+                return shutdown;
         }
     }
     
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigUpdateHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigUpdateHelper.java
index e0027e510..d1435c826 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigUpdateHelper.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigUpdateHelper.java
@@ -107,10 +107,12 @@ public class ConfigUpdateHelper {
         else
             buf.append("<option value=\"download\">Download and verify only</option>");
         
-        if ("install".equals(policy))
-            buf.append("<option value=\"install\" selected=\"true\">Download, verify, and restart</option>");
-        else
-            buf.append("<option value=\"install\">Download, verify, and restart</option>");
+        if (_context.getProperty("wrapper.version") != null) {
+            if ("install".equals(policy))
+                buf.append("<option value=\"install\" selected=\"true\">Download, verify, and restart</option>");
+            else
+                buf.append("<option value=\"install\">Download, verify, and restart</option>");
+        }
         
         buf.append("</select>\n");
         return buf.toString();