diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/GenericNotifierImpl.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/GenericNotifierImpl.java
index 9007383485aa..e0d9a9e7498e 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/GenericNotifierImpl.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/GenericNotifierImpl.java
@@ -131,6 +131,14 @@ public abstract class GenericNotifierImpl<T, Key> {
     }
   }
 
+  @Nullable
+  protected T getObj(final Key key) {
+    synchronized (myLock) {
+      final MyNotification<T> notification = myState.get(key);
+      return notification == null ? null : notification.getObj();
+    }
+  }
+
   protected static class MyNotification<T> extends Notification {
     private T myObj;
 
diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnAuthenticationNotifier.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnAuthenticationNotifier.java
index f08e31f0768b..5008f1e6818e 100644
--- a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnAuthenticationNotifier.java
+++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnAuthenticationNotifier.java
@@ -28,11 +28,13 @@ import com.intellij.openapi.vcs.changes.ui.ChangesViewBalloonProblemNotifier;
 import com.intellij.openapi.vcs.impl.GenericNotifierImpl;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import org.jetbrains.idea.svn.dialogs.SvnInteractiveAuthenticationProvider;
 import org.tmatesoft.svn.core.SVNAuthenticationException;
 import org.tmatesoft.svn.core.SVNCancelException;
 import org.tmatesoft.svn.core.SVNException;
 import org.tmatesoft.svn.core.SVNURL;
 import org.tmatesoft.svn.core.auth.ISVNAuthenticationManager;
+import org.tmatesoft.svn.core.auth.SVNAuthentication;
 import org.tmatesoft.svn.core.internal.util.SVNURLUtil;
 import org.tmatesoft.svn.core.wc.SVNRevision;
 import org.tmatesoft.svn.core.wc.SVNWCClient;
@@ -59,7 +61,7 @@ public class SvnAuthenticationNotifier extends GenericNotifierImpl<SvnAuthentica
     final Ref<Boolean> resultRef = new Ref<Boolean>();
     final boolean done = ProgressManager.getInstance().runProcessWithProgressSynchronously(new Runnable() {
       public void run() {
-        final boolean result = interactiveValidation(obj.myProject, obj.getUrl());
+        final boolean result = interactiveValidation(obj.myProject, obj.getUrl(), obj.getRealm(), obj.getKind());
         log("ask result for: " + obj.getUrl() + " is: " + result);
         resultRef.set(result);
         if (result) {
@@ -76,7 +78,8 @@ public class SvnAuthenticationNotifier extends GenericNotifierImpl<SvnAuthentica
     for (SVNURL key : keys) {
       final SVNURL commonURLAncestor = SVNURLUtil.getCommonURLAncestor(key, obj.getUrl());
       if ((! StringUtil.isEmptyOrSpaces(commonURLAncestor.getHost())) && (! StringUtil.isEmptyOrSpaces(commonURLAncestor.getPath()))) {
-        if (passiveValidation(myVcs.getProject(), key)) {
+        final AuthenticationRequest currObj = getObj(key);
+        if ((currObj != null) && passiveValidation(myVcs.getProject(), key, true, currObj.getRealm(), currObj.getKind())) {
           outdatedRequests.add(key);
         }
       }
@@ -179,20 +182,22 @@ public class SvnAuthenticationNotifier extends GenericNotifierImpl<SvnAuthentica
     LOG.debug(s);
   }
 
-  public static boolean passiveValidation(final Project project, final SVNURL url) {
+  public static boolean passiveValidation(final Project project, final SVNURL url, final boolean checkWrite,
+                                          final String realm, final String kind) {
     final SvnConfiguration configuration = SvnConfiguration.getInstance(project);
     final ISVNAuthenticationManager passiveManager = configuration.getPassiveAuthenticationManager();
-    return validationImpl(project, url, configuration, passiveManager);
+    return validationImpl(project, url, configuration, passiveManager, checkWrite, realm, kind);
   }
 
-  public static boolean interactiveValidation(final Project project, final SVNURL url) {
+  public static boolean interactiveValidation(final Project project, final SVNURL url, final String realm, final String kind) {
     final SvnConfiguration configuration = SvnConfiguration.getInstance(project);
     final ISVNAuthenticationManager passiveManager = configuration.getInteractiveManager(SvnVcs.getInstance(project));
-    return validationImpl(project, url, configuration, passiveManager);
+    return validationImpl(project, url, configuration, passiveManager, true, realm, kind);
   }
 
   private static boolean validationImpl(final Project project, final SVNURL url,
-                                        final SvnConfiguration configuration, final ISVNAuthenticationManager manager) {
+                                        final SvnConfiguration configuration, final ISVNAuthenticationManager manager,
+                                        final boolean checkWrite, final String realm, final String kind) {
     try {
       new SVNWCClient(manager, configuration.getOptions(project)).doInfo(url, SVNRevision.UNDEFINED, SVNRevision.HEAD);
     } catch (SVNAuthenticationException e) {
@@ -207,8 +212,26 @@ public class SvnAuthenticationNotifier extends GenericNotifierImpl<SvnAuthentica
         return false;
       }
       LOG.info("some other exc", e);
+    }
+    if ((! checkWrite) || configuration.haveCredentialsFor(kind, realm)) {
       return true;
     }
-    return true;
+    final SvnVcs svnVcs = SvnVcs.getInstance(project);
+    if (svnVcs.getAuthNotifier().getObj(url) != null) return false;
+
+    final SvnInteractiveAuthenticationProvider provider = new SvnInteractiveAuthenticationProvider(svnVcs);
+    final SVNAuthentication svnAuthentication = provider.requestClientAuthentication(kind, url, realm, null, null, true);
+    if (svnAuthentication != null) {
+      try {
+        configuration.getAuthenticationManager(svnVcs).acknowledgeAuthentication(true, kind, realm, null, svnAuthentication);
+      }
+      catch (SVNException e) {
+        LOG.info(e);
+        // acknowledge at least in runtime
+        configuration.acknowledge(kind, realm, svnAuthentication);
+      }
+      return true;
+    }
+    return false;
   }
 }
diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnBranchConfigurationManager.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnBranchConfigurationManager.java
index ddc2a158a612..1464e569816e 100644
--- a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnBranchConfigurationManager.java
+++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnBranchConfigurationManager.java
@@ -150,7 +150,7 @@ public class SvnBranchConfigurationManager implements PersistentStateComponent<S
           final WorkingCopy wcRoot = rootsToWorkingCopies.getWcRoot(myRoot);
           if (wcRoot == null) return;
 
-          final boolean validated = SvnAuthenticationNotifier.passiveValidation(myProject, wcRoot.getUrl());
+          final boolean validated = SvnAuthenticationNotifier.passiveValidation(myProject, wcRoot.getUrl(), false, null, null);
           if (! validated) return;
 
           for (String newBranchUrl : next.getBranchUrls()) {
diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnConfiguration.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnConfiguration.java
index ad823dc148a2..83fdd6006386 100644
--- a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnConfiguration.java
+++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnConfiguration.java
@@ -443,4 +443,12 @@ public class SvnConfiguration implements ProjectComponent, JDOMExternalizable {
       }, "button.text.clear.authentication.cache", false, myProject);
     }
   }
+  
+  public boolean haveCredentialsFor(final String kind, final String realm) {
+    return RUNTIME_AUTH_CACHE.getData(kind, realm) != null;
+  }
+
+  public void acknowledge(final String kind, final String realm, final Object object) {
+    RUNTIME_AUTH_CACHE.putData(kind, realm, object);
+  }
 }
diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnVcs.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnVcs.java
index 0af67480bea8..0315674bbb73 100644
--- a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnVcs.java
+++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnVcs.java
@@ -166,8 +166,8 @@ public class SvnVcs extends AbstractVcs {
     super(project, VCS_NAME);
     LOG.debug("ct");
     myRootsToWorkingCopies = new RootsToWorkingCopies(myProject);
-    myAuthNotifier = new SvnAuthenticationNotifier(this);
     myConfiguration = svnConfiguration;
+    myAuthNotifier = new SvnAuthenticationNotifier(this);
 
     dumpFileStatus(FileStatus.ADDED);
     dumpFileStatus(FileStatus.DELETED);