diff --git a/apps/routerconsole/java/src/net/i2p/router/web/UpdateHandler.java b/apps/routerconsole/java/src/net/i2p/router/web/UpdateHandler.java
index 2a0e077c0..35edadfb6 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/UpdateHandler.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/UpdateHandler.java
@@ -179,7 +179,11 @@ public class UpdateHandler {
                     restart();
                 } else {
                     _log.log(Log.CRIT, "Update was VERIFIED, will be installed at next restart");
-                    _status = "<b>Update downloaded</b><br />Click Restart to Install";
+                    _status = "<b>Update downloaded</b><br />";
+                    if (System.getProperty("wrapper.version") != null)
+                        _status += "Click Restart to install";
+                    else
+                        _status += "Click Shutdown and restart to install";
                     if (up.newVersion() != null)
                         _status += " Version " + up.newVersion();
                 }
diff --git a/router/java/src/net/i2p/router/Router.java b/router/java/src/net/i2p/router/Router.java
index a849e385c..d2fb6f19d 100644
--- a/router/java/src/net/i2p/router/Router.java
+++ b/router/java/src/net/i2p/router/Router.java
@@ -1029,7 +1029,10 @@ public class Router {
                 System.out.println("ERROR: Unable to delete the update file!");
                 updateFile.deleteOnExit();
             }
-            System.out.println("INFO: Restarting after update");
+            if (System.getProperty("wrapper.version") != null)
+                System.out.println("INFO: Restarting after update");
+            else
+                System.out.println("WARNING: Exiting after update, restart I2P");
             System.exit(EXIT_HARD_RESTART);
         }
     }