diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/IndexBean.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/IndexBean.java
index 8bcf0050d..7505f2b64 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/IndexBean.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/IndexBean.java
@@ -566,8 +566,10 @@ public class IndexBean {
             if (mode > 1) {
                 try {
                     String secret = _helper.getBlindedPassword(tunnel);
-                    boolean requireSecret = secret != null && secret.length() > 0;
-                    return Blinding.encode(_context, d.getSigningPublicKey(), requireSecret, false);
+                    boolean requireSecret = secret != null && secret.length() > 0 &&
+                                            (mode == 3 || mode == 5 || mode == 7);
+                    boolean requireAuth = mode >= 4 && mode <= 7;
+                    return Blinding.encode(_context, d.getSigningPublicKey(), requireSecret, requireAuth);
                 } catch (RuntimeException re) {}
             }
         }