diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnAuthenticationManager.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnAuthenticationManager.java
index f2b981e6c8a7..a2e3a63e1fd5 100644
--- a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnAuthenticationManager.java
+++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnAuthenticationManager.java
@@ -456,20 +456,21 @@ public class SvnAuthenticationManager extends DefaultSVNAuthenticationManager im
       myInteraction.warnOnAuthStorageDisabled(url);
       return;
     }
+    boolean passwordWillBeSaved = true;
     final boolean passwordStorageEnabled = isStorePasswords(url);
     // check can store
     if ((! ISVNAuthenticationManager.SSL.equals(kind)) && (! passwordStorageEnabled)) {
       // but it should be
       myInteraction.warnOnPasswordStorageDisabled(url);
-      return;
+      passwordWillBeSaved = false;
     }
     if (ISVNAuthenticationManager.SSL.equals(kind) && (! isStoreSSLClientCertificatePassphrases(url))) {
       myInteraction.warnOnSSLPassphraseStorageDisabled(url);
-      return;
+      passwordWillBeSaved = false;
     }
 
     // check can encrypt
-    if (!(SystemInfo.isWindows && SVNJNAUtil.isWinCryptEnabled())) {
+    if (passwordWillBeSaved && ( !(SystemInfo.isWindows && SVNJNAUtil.isWinCryptEnabled()))) {
       try {
         if (ISVNAuthenticationManager.SSL.equals(kind)) {
           if (!isStorePlainTextPassphrases(realm, auth)) {
diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnVcs.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnVcs.java
index 4f3d0099469e..f00f7b911e77 100644
--- a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnVcs.java
+++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnVcs.java
@@ -150,7 +150,8 @@ public class SvnVcs extends AbstractVcs<CommittedChangeList> {
   private static RareLogger.LogFilter[] ourLogFilters;
 
   static {
-    SVNJNAUtil.setJNAEnabled(true);
+    // todo rmeove
+    SVNJNAUtil.setJNAEnabled(false);
     SvnHttpAuthMethodsDefaultChecker.check();
 
     //noinspection UseOfArchaicSystemPropertyAccessors