diff --git a/platform/platform-api/src/com/intellij/ide/passwordSafe/PasswordStorage.java b/platform/platform-api/src/com/intellij/ide/passwordSafe/PasswordStorage.java
index f46c6e761979..0080b3ea666c 100644
--- a/platform/platform-api/src/com/intellij/ide/passwordSafe/PasswordStorage.java
+++ b/platform/platform-api/src/com/intellij/ide/passwordSafe/PasswordStorage.java
@@ -22,6 +22,7 @@ import org.jetbrains.annotations.Nullable;
 public interface PasswordStorage {
   @Nullable
   default String getPassword(@NotNull String key) {
+    //noinspection deprecation
     return getPassword(null, null, key);
   }
 
diff --git a/platform/platform-impl/src/com/intellij/ide/passwordSafe/ui/PasswordSafePromptDialog.java b/platform/platform-impl/src/com/intellij/ide/passwordSafe/ui/PasswordSafePromptDialog.java
index 9b421b44c330..df4ad64b202a 100644
--- a/platform/platform-impl/src/com/intellij/ide/passwordSafe/ui/PasswordSafePromptDialog.java
+++ b/platform/platform-impl/src/com/intellij/ide/passwordSafe/ui/PasswordSafePromptDialog.java
@@ -152,7 +152,7 @@ public class PasswordSafePromptDialog extends DialogWrapper {
       ps.setPassword(requestor, key, null);
     }
     else {
-      String pw = ps.getPassword(null, requestor, key);
+      String pw = ps.getPassword(requestor, key);
       if (pw != null) {
         return pw;
       }
diff --git a/plugins/git4idea/src/git4idea/commands/GitHttpGuiAuthenticator.java b/plugins/git4idea/src/git4idea/commands/GitHttpGuiAuthenticator.java
index 4576ad9dcbd5..b011ab5ab020 100644
--- a/plugins/git4idea/src/git4idea/commands/GitHttpGuiAuthenticator.java
+++ b/plugins/git4idea/src/git4idea/commands/GitHttpGuiAuthenticator.java
@@ -281,7 +281,7 @@ class GitHttpGuiAuthenticator implements GitHttpAuthenticator {
       String userName = getUsername(url);
       String key = makeKey(url, userName);
       final PasswordSafe passwordSafe = PasswordSafe.getInstance();
-      String password = passwordSafe.getPassword(myProject, PASS_REQUESTER, key);
+      String password = passwordSafe.getPassword(PASS_REQUESTER, key);
       return new AuthData(StringUtil.notNullize(userName), password);
     }
 
diff --git a/plugins/github/src/org/jetbrains/plugins/github/util/GithubSettings.java b/plugins/github/src/org/jetbrains/plugins/github/util/GithubSettings.java
index fb327c68664d..41f4ced21158 100644
--- a/plugins/github/src/org/jetbrains/plugins/github/util/GithubSettings.java
+++ b/plugins/github/src/org/jetbrains/plugins/github/util/GithubSettings.java
@@ -166,7 +166,7 @@ public class GithubSettings implements PersistentStateComponent<GithubSettings.S
 
   @NotNull
   private String getPassword() {
-    return StringUtil.notNullize(PasswordSafe.getInstance().getPassword(null, GithubSettings.class, GITHUB_SETTINGS_PASSWORD_KEY));
+    return StringUtil.notNullize(PasswordSafe.getInstance().getPassword(GithubSettings.class, GITHUB_SETTINGS_PASSWORD_KEY));
   }
 
   private void setPassword(@NotNull String password, boolean rememberPassword) {
diff --git a/plugins/google-app-engine/source/com/intellij/appengine/cloud/AppEngineCloudConfigurable.java b/plugins/google-app-engine/source/com/intellij/appengine/cloud/AppEngineCloudConfigurable.java
index 5445ff47916c..1cf861c10ac2 100644
--- a/plugins/google-app-engine/source/com/intellij/appengine/cloud/AppEngineCloudConfigurable.java
+++ b/plugins/google-app-engine/source/com/intellij/appengine/cloud/AppEngineCloudConfigurable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2014 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -160,7 +160,7 @@ public class AppEngineCloudConfigurable extends RemoteServerConfigurable impleme
     myConfiguration.setOAuth2(isOAuth2());
     String password = getPassword();
     if (myRememberPasswordCheckBox.isSelected() && !StringUtil.isEmpty(email) && !password.isEmpty()) {
-      AppEngineAccountDialog.storePassword(email, password, myProject);
+      AppEngineAccountDialog.storePassword(email, password);
       myConfiguration.setPasswordStored(true);
     }
     else {
diff --git a/plugins/google-app-engine/source/com/intellij/appengine/facet/AppEngineAccountDialog.java b/plugins/google-app-engine/source/com/intellij/appengine/facet/AppEngineAccountDialog.java
index 773809ad692f..a0f27968ff20 100644
--- a/plugins/google-app-engine/source/com/intellij/appengine/facet/AppEngineAccountDialog.java
+++ b/plugins/google-app-engine/source/com/intellij/appengine/facet/AppEngineAccountDialog.java
@@ -19,7 +19,6 @@ import com.intellij.appengine.cloud.AppEngineAuthData;
 import com.intellij.appengine.cloud.AppEngineCloudConfigurable;
 import com.intellij.appengine.cloud.AppEngineServerConfiguration;
 import com.intellij.ide.passwordSafe.PasswordSafe;
-import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.options.ShowSettingsUtil;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.text.StringUtil;
@@ -30,7 +29,6 @@ import org.jetbrains.annotations.Nullable;
  * @author nik
  */
 public class AppEngineAccountDialog {
-  private static final Logger LOG = Logger.getInstance(AppEngineAccountDialog.class);
   private static final String PASSWORD_KEY = "GOOGLE_APP_ENGINE_PASSWORD";
 
   @Nullable
@@ -41,7 +39,7 @@ public class AppEngineAccountDialog {
 
     String email = configuration.getEmail();
     if (!StringUtil.isEmpty(email) && configuration.isPasswordStored()) {
-      String password = getStoredPassword(project, email);
+      String password = getStoredPassword(email);
       if (!StringUtil.isEmpty(password)) {
         return AppEngineAuthData.login(email, password);
       }
@@ -58,8 +56,8 @@ public class AppEngineAccountDialog {
     return AppEngineAuthData.login(configurable.getEmail(), configurable.getPassword());
   }
 
-  public static void storePassword(@NotNull String email, @NotNull String password, @Nullable Project project) {
-    PasswordSafe.getInstance().storePassword(project, AppEngineAccountDialog.class, getPasswordKey(email), password);
+  public static void storePassword(@NotNull String email, @NotNull String password) {
+    PasswordSafe.getInstance().setPassword(AppEngineAccountDialog.class, getPasswordKey(email), password);
   }
 
   private static String getPasswordKey(String email) {
@@ -67,10 +65,10 @@ public class AppEngineAccountDialog {
   }
 
   @Nullable
-  private static String getStoredPassword(Project project, String email) {
+  private static String getStoredPassword(String email) {
     if (StringUtil.isEmpty(email)) {
       return null;
     }
-    return PasswordSafe.getInstance().getPassword(project, AppEngineAccountDialog.class, getPasswordKey(email));
+    return PasswordSafe.getInstance().getPassword(AppEngineAccountDialog.class, getPasswordKey(email));
   }
 }
diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/execution/HgCommandAuthenticator.java b/plugins/hg4idea/src/org/zmlx/hg4idea/execution/HgCommandAuthenticator.java
index 916651127cce..7f5c4da94931 100644
--- a/plugins/hg4idea/src/org/zmlx/hg4idea/execution/HgCommandAuthenticator.java
+++ b/plugins/hg4idea/src/org/zmlx/hg4idea/execution/HgCommandAuthenticator.java
@@ -114,7 +114,7 @@ class HgCommandAuthenticator {
       String password = null;
       if (!StringUtil.isEmptyOrSpaces(login) && myURL != null) {
         // if we've logged in with this login, search for password
-        password = PasswordSafe.getInstance().getPassword(myProject, HgCommandAuthenticator.class, keyForUrlAndLogin(myURL, login));
+        password = PasswordSafe.getInstance().getPassword(HgCommandAuthenticator.class, keyForUrlAndLogin(myURL, login));
       }
 
       // don't show dialog if we don't have to (both fields are known) except force authorization required
diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/stepic/StepicUser.java b/python/educational-core/student/src/com/jetbrains/edu/learning/stepic/StepicUser.java
index 9a99ff4a0f3c..1aa3f9aed52e 100644
--- a/python/educational-core/student/src/com/jetbrains/edu/learning/stepic/StepicUser.java
+++ b/python/educational-core/student/src/com/jetbrains/edu/learning/stepic/StepicUser.java
@@ -63,7 +63,7 @@ public class StepicUser {
   public String getPassword() {
     final String login = getEmail();
     if (StringUtil.isEmptyOrSpaces(login)) return "";
-    return StringUtil.notNullize(PasswordSafe.getInstance().getPassword(null, StudyTaskManager.class, STEPIC_SETTINGS_PASSWORD_KEY + login));
+    return StringUtil.notNullize(PasswordSafe.getInstance().getPassword(StudyTaskManager.class, STEPIC_SETTINGS_PASSWORD_KEY + login));
   }
 
   @Transient