diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelClient.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelClient.java
index 12931f3a27a9d02a582c2358465263f586c9c87f..36edc0766029b7b37e167c9eca335def90506ceb 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelClient.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelClient.java
@@ -39,7 +39,7 @@ public class I2PTunnelClient extends I2PTunnelClientBase {
             return;
         }
 
-        StringTokenizer tok = new StringTokenizer(destinations, ",");
+        StringTokenizer tok = new StringTokenizer(destinations, ", ");
         dests = new ArrayList(1);
         while (tok.hasMoreTokens()) {
             String destination = tok.nextToken();
diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelClientBase.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelClientBase.java
index c4eafde506f53114ed79182c06d9789fe78b2652..3c571857afc506de94539133b3387243553ff729 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelClientBase.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelClientBase.java
@@ -345,7 +345,9 @@ public abstract class I2PTunnelClientBase extends I2PTunnelTask implements Runna
     public I2PSocket createI2PSocket(Destination dest) throws I2PException, ConnectException, NoRouteToHostException, InterruptedIOException {
         if (sockMgr == null) {
             // we need this before getDefaultOptions()
-            sockMgr = getSocketManager();
+            synchronized(sockLock) {
+                sockMgr = getSocketManager();
+            }
         }
         return createI2PSocket(dest, getDefaultOptions());
     }
@@ -369,9 +371,12 @@ public abstract class I2PTunnelClientBase extends I2PTunnelTask implements Runna
 
         if (sockMgr == null) {
             // delayed open - call get instead of build because the locking is up there
-            sockMgr = getSocketManager();
-        } else if (Boolean.valueOf(getTunnel().getClientOptions().getProperty("i2cp.newDestOnResume")).booleanValue()) {
-            synchronized(sockMgr) {
+            synchronized(sockLock) {
+                sockMgr = getSocketManager();
+            }
+        } else if (Boolean.valueOf(getTunnel().getClientOptions().getProperty("i2cp.closeOnIdle")).booleanValue() &&
+                   Boolean.valueOf(getTunnel().getClientOptions().getProperty("i2cp.newDestOnResume")).booleanValue()) {
+            synchronized(sockLock) {
                 I2PSocketManager oldSockMgr = sockMgr;
                 // This will build a new socket manager and a new dest if the session is closed.
                 sockMgr = getSocketManager();
diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java
index 53c3136b20f86a6d5c5a6053ffe2350859ff7f6b..316731deec7f44c57ba141d7a19c718effd467a9 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java
@@ -211,8 +211,11 @@ public class I2PTunnelHTTPClient extends I2PTunnelClientBase implements Runnable
         if (!defaultOpts.contains("i2p.streaming.inactivityTimeout"))
             defaultOpts.setProperty("i2p.streaming.inactivityTimeout", ""+DEFAULT_READ_TIMEOUT);
         // delayed start
-        if (sockMgr == null)
-            sockMgr = getSocketManager();
+        if (sockMgr == null) {
+            synchronized(sockLock) {
+                sockMgr = getSocketManager();
+            }
+        }
         I2PSocketOptions opts = sockMgr.buildOptions(defaultOpts);
         if (!defaultOpts.containsKey(I2PSocketOptions.PROP_CONNECT_TIMEOUT))
             opts.setConnectTimeout(DEFAULT_CONNECT_TIMEOUT);
diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/EditBean.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/EditBean.java
index a029de725a874dcadc3ab543ef23065807c1fdf5..d606467c529629ab304d8d205372d4c6d9ac8d87 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/EditBean.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/EditBean.java
@@ -153,7 +153,9 @@ public class EditBean extends IndexBean {
     }
     
     public boolean getNewDest(int tunnel) {
-        return getBooleanProperty(tunnel, "i2cp.newDestOnResume");
+        return getBooleanProperty(tunnel, "i2cp.newDestOnResume") &&
+               getBooleanProperty(tunnel, "i2cp.closeOnIdle") &&
+               !getBooleanProperty(tunnel, "persistentClientKey");
     }
     
     public boolean getPersistentClientKey(int tunnel) {