diff --git a/wsagent/che-core-git-impl-native/src/main/java/org/eclipse/che/git/impl/nativegit/GitAskPassScript.java b/wsagent/che-core-git-impl-native/src/main/java/org/eclipse/che/git/impl/nativegit/GitAskPassScript.java
index 27fb043e91a..6da64cafa0b 100644
--- a/wsagent/che-core-git-impl-native/src/main/java/org/eclipse/che/git/impl/nativegit/GitAskPassScript.java
+++ b/wsagent/che-core-git-impl-native/src/main/java/org/eclipse/che/git/impl/nativegit/GitAskPassScript.java
@@ -10,10 +10,11 @@
  *******************************************************************************/
 package org.eclipse.che.git.impl.nativegit;
 
-import org.eclipse.che.api.git.GitException;
 import org.eclipse.che.api.git.UserCredential;
+import org.eclipse.che.commons.env.EnvironmentContext;
 import org.eclipse.che.commons.lang.IoUtil;
-import org.eclipse.che.commons.lang.NameGenerator;
+import org.eclipse.che.api.git.GitException;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -31,7 +32,6 @@ public class GitAskPassScript {
     private static final String GIT_ASK_PASS_SCRIPT_TEMPLATE = "META-INF/NativeGitAskPassTemplate";
     private static final String GIT_ASK_PASS_SCRIPT          = "ask_pass";
     private String gitAskPassTemplate;
-    private File askScriptDirectory;
 
     private static final Logger LOG = LoggerFactory.getLogger(GitAskPassScript.class);
 
@@ -47,8 +47,8 @@ public GitAskPassScript() {
      * @return stored script
      */
     public File build(UserCredential credentials) throws GitException {
-        askScriptDirectory = new File(System.getProperty("java.io.tmpdir") + NameGenerator.generate("", 8));
-
+        File askScriptDirectory = new File(System.getProperty("java.io.tmpdir")
+                                           + "/" + EnvironmentContext.getCurrent().getSubject().getUserName());
         if (!askScriptDirectory.exists()) {
             askScriptDirectory.mkdirs();
         }
@@ -71,7 +71,9 @@ public File build(UserCredential credentials) throws GitException {
 
     public void remove() {
 
-        if (askScriptDirectory != null && askScriptDirectory.exists()) {
+        File askScriptDirectory = new File(System.getProperty("java.io.tmpdir")
+                                           + "/" + EnvironmentContext.getCurrent().getSubject().getUserName());
+        if (askScriptDirectory.exists()) {
             if (!IoUtil.deleteRecursive(askScriptDirectory))
                 LOG.warn("Ask-pass script deletion failed.");
         }