diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConsolePasswordManager.java b/apps/routerconsole/java/src/net/i2p/router/web/ConsolePasswordManager.java
index 0b320023ab6eb241fc4592eed9fbd555e780f019..6c97a0eb1f0a6edeae42d26d95fcb424abf931ea 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/ConsolePasswordManager.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/ConsolePasswordManager.java
@@ -124,7 +124,7 @@ public class ConsolePasswordManager extends RouterPasswordManager {
      *
      *  @return success or nothing to migrate
      */
-    public boolean migrateConsole() {
+    private boolean migrateConsole() {
         synchronized(ConsolePasswordManager.class) {
             if (_context.getBooleanProperty(PROP_MIGRATED))
                 return true;
@@ -205,6 +205,8 @@ public class ConsolePasswordManager extends RouterPasswordManager {
         ConsolePasswordManager pm = new ConsolePasswordManager(ctx);
         if (!pm.migrate())
             System.out.println("Fail 1");
+        if (!pm.migrateConsole())
+            System.out.println("Fail 1a");
 
         System.out.println("Test plain");
         if (!pm.savePlain("type1", "user1", "pw1"))
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/RouterConsoleRunner.java b/apps/routerconsole/java/src/net/i2p/router/web/RouterConsoleRunner.java
index a811e05b94de7ed1dc31d0a7c9c71614918853d2..0780675f88dd55b259988e5397196fffcbfffde7 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/RouterConsoleRunner.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/RouterConsoleRunner.java
@@ -469,9 +469,9 @@ public class RouterConsoleRunner implements RouterApp {
                                 SslSelectChannelConnector sssll = new SslSelectChannelConnector();
                                 // the keystore path and password
                                 sssll.setKeystore(keyStore.getAbsolutePath());
-                                sssll.setPassword(ctx.getProperty(PROP_KEYSTORE_PASSWORD, DEFAULT_KEYSTORE_PASSWORD));
+                                sssll.setPassword(_context.getProperty(PROP_KEYSTORE_PASSWORD, DEFAULT_KEYSTORE_PASSWORD));
                                 // the X.509 cert password (if not present, verifyKeyStore() returned false)
-                                sssll.setKeyPassword(ctx.getProperty(PROP_KEY_PASSWORD, "thisWontWork"));
+                                sssll.setKeyPassword(_context.getProperty(PROP_KEY_PASSWORD, "thisWontWork"));
                                 sssll.setUseDirectBuffers(false);  // default true seems to be leaky
                                 ssll = sssll;
                             } else {
@@ -479,9 +479,9 @@ public class RouterConsoleRunner implements RouterApp {
                                 SslSocketConnector sssll = new SslSocketConnector();
                             // the keystore path and password
                                 sssll.setKeystore(keyStore.getAbsolutePath());
-                                sssll.setPassword(ctx.getProperty(PROP_KEYSTORE_PASSWORD, DEFAULT_KEYSTORE_PASSWORD));
+                                sssll.setPassword(_context.getProperty(PROP_KEYSTORE_PASSWORD, DEFAULT_KEYSTORE_PASSWORD));
                             // the X.509 cert password (if not present, verifyKeyStore() returned false)
-                                sssll.setKeyPassword(ctx.getProperty(PROP_KEY_PASSWORD, "thisWontWork"));
+                                sssll.setKeyPassword(_context.getProperty(PROP_KEY_PASSWORD, "thisWontWork"));
                                 ssll = sssll;
                             }
                             ssll.setHost(host);
diff --git a/apps/routerconsole/jsp/configclients.jsp b/apps/routerconsole/jsp/configclients.jsp
index e97b22968d8c4fa0180bdea6108e632666cffdf2..13a4d6f1ba17f04b6adee7cee5f85fc60da6acee 100644
--- a/apps/routerconsole/jsp/configclients.jsp
+++ b/apps/routerconsole/jsp/configclients.jsp
@@ -85,9 +85,9 @@ input.default { width: 1px; height: 1px; visibility: hidden; }
 <input type="checkbox" class="optbox" name="auth" value="true" <jsp:getProperty name="clientshelper" property="auth" /> >
 <%=intl._("Require username and password")%><br>
 <%=intl._("Username")%>:
-<input name="user" type="text" value="<jsp:getProperty name="clientshelper" property="user" />" ><br>
+<input name="user" type="text" value="" /><br>
 <%=intl._("Password")%>:
-<input name="pw" type="password" value="<jsp:getProperty name="clientshelper" property="pw" />" ><br>
+<input name="pw" type="password" value="" /><br>
 </p><p><b><%=intl._("The default settings will work for most people.")%></b>
 <%=intl._("Any changes made here must also be configured in the external client.")%>
 <%=intl._("Many clients do not support SSL or authorization.")%>
diff --git a/router/java/src/net/i2p/router/startup/RouterAppManager.java b/router/java/src/net/i2p/router/startup/RouterAppManager.java
index 45f27fefbb4d704f2d312198207fcf6a314b40a6..25d6da932f9d6109a85293ab97bce3d893132348 100644
--- a/router/java/src/net/i2p/router/startup/RouterAppManager.java
+++ b/router/java/src/net/i2p/router/startup/RouterAppManager.java
@@ -55,13 +55,13 @@ public class RouterAppManager implements ClientAppManager {
           case UNINITIALIZED:
           case INITIALIZED:
             if (_log.shouldLog(Log.WARN))
-                _log.warn("Client " + app.getDisplayName() + " called notify for" + state);
+                _log.warn("Client " + app.getDisplayName() + " called notify for " + state);
             break;
 
           case STARTING:
           case RUNNING:
             if (_log.shouldLog(Log.INFO))
-                _log.info("Client " + app.getDisplayName() + " called notify for" + state);
+                _log.info("Client " + app.getDisplayName() + " called notify for " + state);
             break;
 
           case FORKED:
@@ -72,7 +72,7 @@ public class RouterAppManager implements ClientAppManager {
             if (message == null)
                 message = "";
             if (_log.shouldLog(Log.INFO))
-                _log.info("Client " + app.getDisplayName() + " called notify for" + state +
+                _log.info("Client " + app.getDisplayName() + " called notify for " + state +
                           ' ' + message, e);
             break;
 
diff --git a/router/java/src/net/i2p/router/util/RouterPasswordManager.java b/router/java/src/net/i2p/router/util/RouterPasswordManager.java
index b52d740670d2deda042fbd2f802b0c6b23e457a9..6b5fbb7f0cb5b4cf852a900aa128692f080152b2 100644
--- a/router/java/src/net/i2p/router/util/RouterPasswordManager.java
+++ b/router/java/src/net/i2p/router/util/RouterPasswordManager.java
@@ -60,7 +60,7 @@ public class RouterPasswordManager extends PasswordManager {
      *
      *  @return success or nothing to migrate
      */
-    public boolean migrate() {
+    protected boolean migrate() {
         synchronized(RouterPasswordManager.class) {
             if (_context.getBooleanProperty(PROP_MIGRATED))
                 return true;