1 files changed, 4 insertions, 3 deletions
diff --git a/plugins/github/src/org/jetbrains/plugins/github/ui/GithubSettingsPanel.java b/plugins/github/src/org/jetbrains/plugins/github/ui/GithubSettingsPanel.java
index 7de0dae30d69..229170e29ead 100644
--- a/plugins/github/src/org/jetbrains/plugins/github/ui/GithubSettingsPanel.java
+++ b/plugins/github/src/org/jetbrains/plugins/github/ui/GithubSettingsPanel.java
@@ -130,7 +130,8 @@ public class GithubSettingsPanel {
               @NotNull
               @Override
               public String convert(ProgressIndicator indicator) throws IOException {
-                return GithubUtil.runTaskWithBasicAuthForHost(project, GithubAuthDataHolder.createFromSettings(), indicator, getHost(),
+                return GithubUtil.runTaskWithBasicAuthForHost(project, GithubAuthDataHolder.createFromSettings(indicator.getModalityState()),
+                                                              indicator, getHost(),
                                                               new ThrowableConvertor<GithubAuthData, String, IOException>() {
                                                                 @NotNull
                                                                 @Override
@@ -262,7 +263,7 @@ public class GithubSettingsPanel {
   @NotNull
   public GithubAuthData getAuthData() {
     if (!myCredentialsModified) {
-      return mySettings.getAuthData();
+      return mySettings.getAuthData(null);
     }
     Object selected = myAuthTypeComboBox.getSelectedItem();
     if (AUTH_PASSWORD.equals(selected)) return GithubAuthData.createBasicAuth(getHost(), getLogin(), getPassword());
@@ -290,7 +291,7 @@ public class GithubSettingsPanel {
 
   public void apply() {
     if (myCredentialsModified) {
-      mySettings.setAuthData(getAuthData(), true);
+      mySettings.setAuthData(getAuthData(), true, null);
     }
     mySettings.setConnectionTimeout(getConnectionTimeout());
     resetCredentialsModification();