diff --git a/docs/todo.txt b/docs/todo.txt
index b8db142e21670035621893431274ebe5f40b565d..19b2f8823c49b9d2bbd96b4b306da532437b8a5f 100644
--- a/docs/todo.txt
+++ b/docs/todo.txt
@@ -1,7 +1,6 @@
 Major:
 
-S/DB selector combo works as crap
-Multiple tabs - tab removed after execute
+error: S/DB selector combo works as crap
 SOCKS proxy, HTTP proxy
 
 1. Browse data by foreign keys
diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/net/ssh/SSHTunnelImpl.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/net/ssh/SSHTunnelImpl.java
index a78641fe9c4634e20e5ed4281aa0eeb35279f490..0f88a9fc20ea22419d896c7726e86174c2d3a549 100644
--- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/net/ssh/SSHTunnelImpl.java
+++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/net/ssh/SSHTunnelImpl.java
@@ -119,6 +119,8 @@ public class SSHTunnelImpl implements DBWTunnel {
 
             session = jsch.getSession(sshUser, sshHost, sshPortNum);
             session.setConfig("StrictHostKeyChecking", "no");
+            session.setConfig("PreferredAuthentications",
+                    privKeyFile != null ? "publickey" : "password");
             session.setUserInfo(ui);
             session.connect();
             try {