diff --git a/databricks-sdk-java/src/main/java/com/databricks/sdk/core/oauth/ExternalBrowserCredentialsProvider.java b/databricks-sdk-java/src/main/java/com/databricks/sdk/core/oauth/ExternalBrowserCredentialsProvider.java
index 3708887ef..70b7e1e21 100644
--- a/databricks-sdk-java/src/main/java/com/databricks/sdk/core/oauth/ExternalBrowserCredentialsProvider.java
+++ b/databricks-sdk-java/src/main/java/com/databricks/sdk/core/oauth/ExternalBrowserCredentialsProvider.java
@@ -112,6 +112,7 @@ CachedTokenSource performBrowserAuth(
             .withClientId(clientId)
             .withClientSecret(clientSecret)
             .withHost(config.getHost())
+            .withAccountId(config.getAccountId())
             .withRedirectUrl(config.getEffectiveOAuthRedirectUrl())
             .withScopes(config.getScopes())
             .build();
diff --git a/databricks-sdk-java/src/main/java/com/databricks/sdk/core/oauth/OAuthClient.java b/databricks-sdk-java/src/main/java/com/databricks/sdk/core/oauth/OAuthClient.java
index cf65ba71a..139031c8c 100644
--- a/databricks-sdk-java/src/main/java/com/databricks/sdk/core/oauth/OAuthClient.java
+++ b/databricks-sdk-java/src/main/java/com/databricks/sdk/core/oauth/OAuthClient.java
@@ -35,6 +35,7 @@ public static class Builder {
     private List<String> scopes;
     private String clientSecret;
     private HttpClient hc;
+    private String accountId;
 
     public Builder() {}
 
@@ -71,6 +72,11 @@ public Builder withScopes(List<String> scopes) {
     public OAuthClient build() throws IOException {
       return new OAuthClient(this);
     }
+
+    public Builder withAccountId(String accountId) {
+      this.accountId = accountId;
+      return this;
+    }
   }
 
   private final String clientId;
@@ -92,7 +98,8 @@ private OAuthClient(Builder b) throws IOException {
     this.host = b.host;
     this.hc = b.hc;
 
-    DatabricksConfig config = new DatabricksConfig().setHost(b.host).resolve();
+    DatabricksConfig config =
+        new DatabricksConfig().setHost(b.host).setAccountId(b.accountId).resolve();
     OpenIDConnectEndpoints oidc = config.getOidcEndpoints();
     if (oidc == null) {
       throw new DatabricksException(b.host + " does not support OAuth");