diff --git a/wsmaster/che-core-api-factory-github-common/src/main/java/org/eclipse/che/api/factory/server/github/AbstractGithubPersonalAccessTokenFetcher.java b/wsmaster/che-core-api-factory-github-common/src/main/java/org/eclipse/che/api/factory/server/github/AbstractGithubPersonalAccessTokenFetcher.java
index 05b6dd0c49..0e0fc84e6e 100644
--- a/wsmaster/che-core-api-factory-github-common/src/main/java/org/eclipse/che/api/factory/server/github/AbstractGithubPersonalAccessTokenFetcher.java
+++ b/wsmaster/che-core-api-factory-github-common/src/main/java/org/eclipse/che/api/factory/server/github/AbstractGithubPersonalAccessTokenFetcher.java
@@ -142,7 +142,9 @@ public abstract class AbstractGithubPersonalAccessTokenFetcher
           isValid(
               new PersonalAccessTokenParams(
                   scmServerUrl,
-                  OAUTH_PROVIDER_NAME,
+                  providerName.equals(OAUTH_PROVIDER_NAME)
+                      ? OAUTH_PROVIDER_NAME
+                      : OAUTH_PROVIDER_NAME + "-second",
                   tokenName,
                   tokenId,
                   oAuthToken.getToken(),
diff --git a/wsmaster/che-core-api-factory/src/main/java/org/eclipse/che/api/factory/server/scm/PersonalAccessTokenParams.java b/wsmaster/che-core-api-factory/src/main/java/org/eclipse/che/api/factory/server/scm/PersonalAccessTokenParams.java
index 4ea748d5f5..3b06b65b6f 100644
--- a/wsmaster/che-core-api-factory/src/main/java/org/eclipse/che/api/factory/server/scm/PersonalAccessTokenParams.java
+++ b/wsmaster/che-core-api-factory/src/main/java/org/eclipse/che/api/factory/server/scm/PersonalAccessTokenParams.java
@@ -39,6 +39,14 @@ public class PersonalAccessTokenParams {
     return scmProviderUrl;
   }
 
+  /**
+   * This method returns the provider name if the token is a Personal Access Token, and the token
+   * name in format oauth2-<random string from 5 chars> if the token is an oauth token. Deprecated:
+   * We need to add a new method to distinguish oauth tokens from personal access tokens.
+   *
+   * @return token name
+   */
+  @Deprecated
   public String getScmTokenName() {
     return scmTokenName;
   }