diff --git a/core/src/main/java/hudson/scm/SubversionSCM.java b/core/src/main/java/hudson/scm/SubversionSCM.java
index babe1554a925b2644ff287a0c02f2217dd098aeb..65d878be7a6ef90ea850b60d3e626044049f3f5e 100644
--- a/core/src/main/java/hudson/scm/SubversionSCM.java
+++ b/core/src/main/java/hudson/scm/SubversionSCM.java
@@ -1128,7 +1128,7 @@ public class SubversionSCM extends SCM implements Serializable {
             // SVNKit wants a key in a file
             final File keyFile;
             FileItem item=null;
-            if(kind.equals("password")) {
+            if(idx <= 1) {
                 keyFile = null;
             } else {
                 item = parser.getFileItem(kind.equals("publickey")?"privateKey":"certificate");