diff --git a/internal/auth0/client/expand.go b/internal/auth0/client/expand.go
index 96a574ef..73192c39 100644
--- a/internal/auth0/client/expand.go
+++ b/internal/auth0/client/expand.go
@@ -1,7 +1,7 @@
 package client
 
 import (
-	"encoding/json"
+	"fmt"
 
 	"github.com/auth0/go-auth0"
 	"github.com/auth0/go-auth0/management"
@@ -11,12 +11,7 @@ import (
 	"github.com/auth0/terraform-provider-auth0/internal/value"
 )
 
-type nilableClient struct {
-	management.Client
-	DefaultOrganization *management.ClientDefaultOrganization `json:"default_organization"`
-}
-
-func expandClient(data *schema.ResourceData) (interface{}, error) {
+func expandClient(data *schema.ResourceData) (*management.Client, error) {
 	config := data.GetRawConfig()
 
 	client := &management.Client{
@@ -53,6 +48,7 @@ func expandClient(data *schema.ResourceData) (interface{}, error) {
 		Addons:                             expandClientAddons(data),
 		NativeSocialLogin:                  expandClientNativeSocialLogin(data),
 		Mobile:                             expandClientMobile(data),
+		DefaultOrganization:                expandDefaultOrganization(data),
 	}
 
 	if data.IsNewResource() && client.IsTokenEndpointIPHeaderTrusted != nil {
@@ -68,41 +64,43 @@ func expandClient(data *schema.ResourceData) (interface{}, error) {
 		}
 	}
 
-	defaultOrg := config.GetAttr("default_organization")
+	defaultConfig := data.GetRawConfig().GetAttr("default_organization")
 
-	if !defaultOrg.IsNull() && defaultOrg.LengthInt() > 0 {
-		if defaultOrg.AsValueSlice()[0].GetAttr("disable").True() {
-			clientJSON, err := json.Marshal(client)
-			if err != nil {
-				return nil, err
-			}
+	for _, item := range defaultConfig.AsValueSlice() {
+		disable := item.GetAttr("disable")
+		organizationID := item.GetAttr("organization_id")
+		flows := item.GetAttr("flows")
 
-			nilableClient := nilableClient{}
-			if err := json.Unmarshal(clientJSON, &nilableClient); err != nil {
-				return nil, err
+		if !disable.IsNull() && disable.True() {
+			if (!flows.IsNull() && flows.LengthInt() > 0) || (!organizationID.IsNull() && organizationID.AsString() != "") {
+				return nil, fmt.Errorf("cannot set both disable and either flows/organization_id")
 			}
-			nilableClient.DefaultOrganization = nil
-			return nilableClient, nil
 		}
-		client.DefaultOrganization = expandDefaultOrganization(data)
 	}
 
 	return client, nil
 }
 
 func expandDefaultOrganization(data *schema.ResourceData) *management.ClientDefaultOrganization {
-	var defaultOrg management.ClientDefaultOrganization
-
-	defaultOrganizationConfig := data.GetRawConfig().GetAttr("default_organization")
-	if defaultOrganizationConfig.IsNull() {
+	if !data.IsNewResource() && !data.HasChange("default_organization") {
 		return nil
 	}
+	var defaultOrg management.ClientDefaultOrganization
 
-	defaultOrganizationConfig.ForEachElement(func(_ cty.Value, config cty.Value) (stop bool) {
-		defaultOrg.Flows = value.Strings(config.GetAttr("flows"))
-		defaultOrg.OrganizationID = value.String(config.GetAttr("organization_id"))
+	config := data.GetRawConfig().GetAttr("default_organization")
+	if config.IsNull() || config.ForEachElement(func(_ cty.Value, cfg cty.Value) (stop bool) {
+		disable := cfg.GetAttr("disable")
+		if !disable.IsNull() && disable.True() {
+			stop = true
+		} else {
+			defaultOrg.Flows = value.Strings(cfg.GetAttr("flows"))
+			defaultOrg.OrganizationID = value.String(cfg.GetAttr("organization_id"))
+		}
 		return stop
-	})
+	}) {
+		// We forced an early return because it was disabled.
+		return nil
+	}
 	if defaultOrg == (management.ClientDefaultOrganization{}) {
 		return nil
 	}
@@ -110,6 +108,31 @@ func expandDefaultOrganization(data *schema.ResourceData) *management.ClientDefa
 	return &defaultOrg
 }
 
+func isDefaultOrgNull(data *schema.ResourceData) bool {
+	if !data.IsNewResource() && !data.HasChange("default_organization") {
+		return false
+	}
+	empty := true
+	config := data.GetRawConfig()
+	defaultOrgConfig := config.GetAttr("default_organization")
+	if defaultOrgConfig.IsNull() || defaultOrgConfig.ForEachElement(func(_ cty.Value, cfg cty.Value) (stop bool) {
+		disable := cfg.GetAttr("disable")
+		flows := cfg.GetAttr("flows")
+		organizationID := cfg.GetAttr("organization_id")
+
+		if (!disable.IsNull() && disable.True()) || (flows.IsNull() && organizationID.IsNull()) {
+			stop = true
+		} else {
+			empty = false
+		}
+		return stop
+	}) {
+		// We forced an early return because it was disabled.
+		return true
+	}
+	return empty
+}
+
 func expandOIDCBackchannelLogout(data *schema.ResourceData) *management.OIDCBackchannelLogout {
 	raw := data.GetRawConfig().GetAttr("oidc_backchannel_logout_urls")
 
diff --git a/internal/auth0/client/resource.go b/internal/auth0/client/resource.go
index 348775db..d4e0f956 100644
--- a/internal/auth0/client/resource.go
+++ b/internal/auth0/client/resource.go
@@ -2,8 +2,8 @@ package client
 
 import (
 	"context"
-	"encoding/json"
 	"net/http"
+	"time"
 
 	"github.com/auth0/go-auth0/management"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
@@ -1277,30 +1277,28 @@ func NewResource() *schema.Resource {
 				Type:        schema.TypeList,
 				Optional:    true,
 				MaxItems:    1,
-				Description: "Configure and associate an organization with the Client",
 				Computed:    true,
+				Description: "Configure and associate an organization with the Client",
 				Elem: &schema.Resource{
 					Schema: map[string]*schema.Schema{
 						"flows": {
-							Type:          schema.TypeList,
-							Optional:      true,
-							Elem:          &schema.Schema{Type: schema.TypeString},
-							RequiredWith:  []string{"default_organization.0.organization_id"},
-							ConflictsWith: []string{"default_organization.0.disable"},
-							Description:   "Definition of the flow that needs to be configured. Eg. client_credentials",
+							Type:        schema.TypeList,
+							Optional:    true,
+							Computed:    true,
+							Elem:        &schema.Schema{Type: schema.TypeString},
+							Description: "Definition of the flow that needs to be configured. Eg. client_credentials",
 						},
 						"organization_id": {
-							Type:          schema.TypeString,
-							Optional:      true,
-							RequiredWith:  []string{"default_organization.0.flows"},
-							ConflictsWith: []string{"default_organization.0.disable"},
-							Description:   "The unique identifier of the organization",
+							Type:        schema.TypeString,
+							Optional:    true,
+							Computed:    true,
+							Description: "The unique identifier of the organization",
 						},
 						"disable": {
-							Type:          schema.TypeBool,
-							Optional:      true,
-							ConflictsWith: []string{"default_organization.0.organization_id", "default_organization.0.flows"},
-							Description:   "If set, the `default_organization` will be removed.",
+							Type:        schema.TypeBool,
+							Optional:    true,
+							Computed:    true,
+							Description: "If set, the `default_organization` will be removed.",
 						},
 					},
 				},
@@ -1313,27 +1311,15 @@ func createClient(ctx context.Context, data *schema.ResourceData, meta interface
 	api := meta.(*config.Config).GetAPI()
 	client, err := expandClient(data)
 
-	if err != nil {
-		return diag.FromErr(err)
-	}
-	err = api.Request(ctx, http.MethodPost, api.URI("clients"), client)
-	if err != nil {
-		return diag.FromErr(err)
-	}
-
-	baseClient := management.Client{}
-	clientJSON, err := json.Marshal(client)
-
 	if err != nil {
 		return diag.FromErr(err)
 	}
 
-	if err = json.Unmarshal(clientJSON, &baseClient); err != nil {
+	if err := api.Client.Create(ctx, client); err != nil {
 		return diag.FromErr(err)
 	}
 
-	data.SetId(baseClient.GetClientID())
-
+	data.SetId(client.GetClientID())
 	return readClient(ctx, data, meta)
 }
 
@@ -1357,20 +1343,8 @@ func updateClient(ctx context.Context, data *schema.ResourceData, meta interface
 		return diag.FromErr(err)
 	}
 
-	baseClient := management.Client{}
-	clientJSON, err := json.Marshal(client)
-
-	if err != nil {
-		return diag.FromErr(err)
-	}
-
-	if err = json.Unmarshal(clientJSON, &baseClient); err != nil {
-		return diag.FromErr(err)
-	}
-
-	if clientHasChange(&baseClient) {
-		if baseClient.GetAddons() != nil {
-			// In case we are switching addons, we need to be able to clear out the previous config.
+	if clientHasChange(client) {
+		if client.GetAddons() != nil {
 			resetAddons := &management.Client{
 				Addons: &management.ClientAddons{},
 			}
@@ -1379,12 +1353,20 @@ func updateClient(ctx context.Context, data *schema.ResourceData, meta interface
 			}
 		}
 
-		err = api.Request(ctx, http.MethodPatch, api.URI("clients", data.Id()), client)
-		if err != nil {
-			return diag.FromErr(err)
+		if err := api.Client.Update(ctx, data.Id(), client); err != nil {
+			return diag.FromErr(internalError.HandleAPIError(data, err))
 		}
-	}
 
+		time.Sleep(200 * time.Millisecond)
+
+		if isDefaultOrgNull(data) {
+			if err := api.Request(ctx, http.MethodPatch, api.URI("clients", data.Id()), map[string]interface{}{
+				"default_organization": nil,
+			}); err != nil {
+				return diag.FromErr(err)
+			}
+		}
+	}
 	return readClient(ctx, data, meta)
 }
 
diff --git a/internal/auth0/client/resource_test.go b/internal/auth0/client/resource_test.go
index 963fe240..54122804 100644
--- a/internal/auth0/client/resource_test.go
+++ b/internal/auth0/client/resource_test.go
@@ -2388,14 +2388,6 @@ resource "auth0_client" "my_client" {
 func TestAccClientWithDefaultOrganization(t *testing.T) {
 	acctest.Test(t, resource.TestCase{
 		Steps: []resource.TestStep{
-			{
-				Config:      acctest.ParseTestName(testAccUpdateClientDefaultOrganizationFlowsOnly, t.Name()),
-				ExpectError: regexp.MustCompile("Error: Missing required argument"),
-			},
-			{
-				Config:      acctest.ParseTestName(testAccUpdateClientDefaultOrganizationOrgIDOnly, t.Name()),
-				ExpectError: regexp.MustCompile("Error: Missing required argument"),
-			},
 			{
 				Config: acctest.ParseTestName(testAccCreateClientWithDefaultOrganization, t.Name()),
 				Check: resource.ComposeTestCheckFunc(
@@ -2424,6 +2416,14 @@ func TestAccClientWithDefaultOrganization(t *testing.T) {
 					resource.TestCheckResourceAttr("auth0_client.my_client", "default_organization.0.organization_id", ""),
 				),
 			},
+			{
+				Config:      acctest.ParseTestName(testAccUpdateClientDefaultOrganizationFlowsOnly, t.Name()),
+				ExpectError: regexp.MustCompile("400 Bad Request"),
+			},
+			{
+				Config:      acctest.ParseTestName(testAccUpdateClientDefaultOrganizationOrgIDOnly, t.Name()),
+				ExpectError: regexp.MustCompile("400 Bad Request"),
+			},
 		},
 	})
 }
diff --git a/test/data/recordings/TestAccClientWithDefaultOrganization.yaml b/test/data/recordings/TestAccClientWithDefaultOrganization.yaml
index 41935301..9dd529c5 100644
--- a/test/data/recordings/TestAccClientWithDefaultOrganization.yaml
+++ b/test/data/recordings/TestAccClientWithDefaultOrganization.yaml
@@ -19,7 +19,7 @@ interactions:
             Content-Type:
                 - application/json
             User-Agent:
-                - Go-Auth0/1.9.0
+                - Go-Auth0/1.10.0
         url: https://terraform-provider-auth0-dev.eu.auth0.com/api/v2/organizations
         method: POST
       response:
@@ -30,13 +30,13 @@ interactions:
         trailer: {}
         content_length: 73
         uncompressed: false
-        body: '{"id":"org_L9tuSpc9hrPx5Ewe","display_name":"temp-org","name":"temp-org"}'
+        body: '{"id":"org_dPrpVR1m8M0wXXq6","display_name":"temp-org","name":"temp-org"}'
         headers:
             Content-Type:
                 - application/json; charset=utf-8
         status: 201 Created
         code: 201
-        duration: 387.304ms
+        duration: 378.650583ms
     - id: 1
       request:
         proto: HTTP/1.1
@@ -54,8 +54,8 @@ interactions:
             Content-Type:
                 - application/json
             User-Agent:
-                - Go-Auth0/1.9.0
-        url: https://terraform-provider-auth0-dev.eu.auth0.com/api/v2/organizations/org_L9tuSpc9hrPx5Ewe
+                - Go-Auth0/1.10.0
+        url: https://terraform-provider-auth0-dev.eu.auth0.com/api/v2/organizations/org_dPrpVR1m8M0wXXq6
         method: GET
       response:
         proto: HTTP/2.0
@@ -65,13 +65,13 @@ interactions:
         trailer: {}
         content_length: -1
         uncompressed: true
-        body: '{"id":"org_L9tuSpc9hrPx5Ewe","name":"temp-org","display_name":"temp-org"}'
+        body: '{"id":"org_dPrpVR1m8M0wXXq6","name":"temp-org","display_name":"temp-org"}'
         headers:
             Content-Type:
                 - application/json; charset=utf-8
         status: 200 OK
         code: 200
-        duration: 319.546208ms
+        duration: 343.328875ms
     - id: 2
       request:
         proto: HTTP/1.1
@@ -89,7 +89,7 @@ interactions:
             Content-Type:
                 - application/json
             User-Agent:
-                - Go-Auth0/1.9.0
+                - Go-Auth0/1.10.0
         url: https://terraform-provider-auth0-dev.eu.auth0.com/api/v2/organizations/name/temp-org
         method: GET
       response:
@@ -100,13 +100,13 @@ interactions:
         trailer: {}
         content_length: -1
         uncompressed: true
-        body: '{"id":"org_L9tuSpc9hrPx5Ewe","name":"temp-org","display_name":"temp-org"}'
+        body: '{"id":"org_dPrpVR1m8M0wXXq6","name":"temp-org","display_name":"temp-org"}'
         headers:
             Content-Type:
                 - application/json; charset=utf-8
         status: 200 OK
         code: 200
-        duration: 368.10525ms
+        duration: 370.725667ms
     - id: 3
       request:
         proto: HTTP/1.1
@@ -124,8 +124,8 @@ interactions:
             Content-Type:
                 - application/json
             User-Agent:
-                - Go-Auth0/1.9.0
-        url: https://terraform-provider-auth0-dev.eu.auth0.com/api/v2/organizations/org_L9tuSpc9hrPx5Ewe/enabled_connections?include_totals=true&page=0&per_page=100
+                - Go-Auth0/1.10.0
+        url: https://terraform-provider-auth0-dev.eu.auth0.com/api/v2/organizations/org_dPrpVR1m8M0wXXq6/enabled_connections?include_totals=true&page=0&per_page=100
         method: GET
       response:
         proto: HTTP/2.0
@@ -141,7 +141,7 @@ interactions:
                 - application/json; charset=utf-8
         status: 200 OK
         code: 200
-        duration: 314.2135ms
+        duration: 354.169375ms
     - id: 4
       request:
         proto: HTTP/1.1
@@ -159,8 +159,8 @@ interactions:
             Content-Type:
                 - application/json
             User-Agent:
-                - Go-Auth0/1.9.0
-        url: https://terraform-provider-auth0-dev.eu.auth0.com/api/v2/organizations/org_L9tuSpc9hrPx5Ewe/members?fields=user_id&include_fields=true&include_totals=true&per_page=50&take=100
+                - Go-Auth0/1.10.0
+        url: https://terraform-provider-auth0-dev.eu.auth0.com/api/v2/organizations/org_dPrpVR1m8M0wXXq6/members?fields=user_id&include_fields=true&include_totals=true&per_page=50&take=100
         method: GET
       response:
         proto: HTTP/2.0
@@ -176,7 +176,7 @@ interactions:
                 - application/json; charset=utf-8
         status: 200 OK
         code: 200
-        duration: 375.036667ms
+        duration: 339.342542ms
     - id: 5
       request:
         proto: HTTP/1.1
@@ -189,13 +189,13 @@ interactions:
         remote_addr: ""
         request_uri: ""
         body: |
-            {"name":"Acceptance Test - DefaultOrganization - TestAccClientWithDefaultOrganization","default_organization":{"flows":["client_credentials"],"organization_id":"org_L9tuSpc9hrPx5Ewe"}}
+            {"name":"Acceptance Test - DefaultOrganization - TestAccClientWithDefaultOrganization","default_organization":{"flows":["client_credentials"],"organization_id":"org_dPrpVR1m8M0wXXq6"}}
         form: {}
         headers:
             Content-Type:
                 - application/json
             User-Agent:
-                - Go-Auth0/1.9.0
+                - Go-Auth0/1.10.0
         url: https://terraform-provider-auth0-dev.eu.auth0.com/api/v2/clients
         method: POST
       response:
@@ -206,13 +206,13 @@ interactions:
         trailer: {}
         content_length: -1
         uncompressed: false
-        body: '{"name":"Acceptance Test - DefaultOrganization - TestAccClientWithDefaultOrganization","client_id":"UF2V30gQir0tyP4rqdVH1zm8VaJZDV6O","client_secret":"[REDACTED]","is_first_party":true,"is_token_endpoint_ip_header_trusted":false,"oidc_conformant":false,"jwt_configuration":{"secret_encoded":false,"lifetime_in_seconds":36000},"signing_keys":[{"cert":"[REDACTED]"}],"sso_disabled":false,"grant_types":["authorization_code","implicit","refresh_token","client_credentials"],"custom_login_page_on":true,"refresh_token":{"rotation_type":"non-rotating","expiration_type":"non-expiring","leeway":0,"token_lifetime":2592000,"infinite_token_lifetime":true,"infinite_idle_token_lifetime":true,"idle_token_lifetime":1296000},"default_organization":{"flows":["client_credentials"],"organization_id":"org_L9tuSpc9hrPx5Ewe"}}'
+        body: '{"name":"Acceptance Test - DefaultOrganization - TestAccClientWithDefaultOrganization","client_id":"ISmgFMkTmKUxEUjZRoqsEMRG4NChhxU9","client_secret":"[REDACTED]","is_first_party":true,"is_token_endpoint_ip_header_trusted":false,"oidc_conformant":false,"jwt_configuration":{"secret_encoded":false,"lifetime_in_seconds":36000},"signing_keys":[{"cert":"[REDACTED]"}],"sso_disabled":false,"grant_types":["authorization_code","implicit","refresh_token","client_credentials"],"custom_login_page_on":true,"refresh_token":{"rotation_type":"non-rotating","expiration_type":"non-expiring","leeway":0,"token_lifetime":2592000,"infinite_token_lifetime":true,"infinite_idle_token_lifetime":true,"idle_token_lifetime":1296000},"default_organization":{"flows":["client_credentials"],"organization_id":"org_dPrpVR1m8M0wXXq6"}}'
         headers:
             Content-Type:
                 - application/json; charset=utf-8
         status: 201 Created
         code: 201
-        duration: 535.428875ms
+        duration: 604.857542ms
     - id: 6
       request:
         proto: HTTP/1.1
@@ -230,8 +230,8 @@ interactions:
             Content-Type:
                 - application/json
             User-Agent:
-                - Go-Auth0/1.9.0
-        url: https://terraform-provider-auth0-dev.eu.auth0.com/api/v2/clients/UF2V30gQir0tyP4rqdVH1zm8VaJZDV6O
+                - Go-Auth0/1.10.0
+        url: https://terraform-provider-auth0-dev.eu.auth0.com/api/v2/clients/ISmgFMkTmKUxEUjZRoqsEMRG4NChhxU9
         method: GET
       response:
         proto: HTTP/2.0
@@ -241,13 +241,13 @@ interactions:
         trailer: {}
         content_length: -1
         uncompressed: true
-        body: '{"name":"Acceptance Test - DefaultOrganization - TestAccClientWithDefaultOrganization","client_id":"UF2V30gQir0tyP4rqdVH1zm8VaJZDV6O","client_secret":"[REDACTED]","is_first_party":true,"is_token_endpoint_ip_header_trusted":false,"oidc_conformant":false,"jwt_configuration":{"secret_encoded":false,"lifetime_in_seconds":36000},"signing_keys":[{"cert":"[REDACTED]"}],"sso_disabled":false,"grant_types":["authorization_code","implicit","refresh_token","client_credentials"],"custom_login_page_on":true,"refresh_token":{"rotation_type":"non-rotating","expiration_type":"non-expiring","leeway":0,"token_lifetime":2592000,"infinite_token_lifetime":true,"infinite_idle_token_lifetime":true,"idle_token_lifetime":1296000},"default_organization":{"flows":["client_credentials"],"organization_id":"org_L9tuSpc9hrPx5Ewe"}}'
+        body: '{"name":"Acceptance Test - DefaultOrganization - TestAccClientWithDefaultOrganization","client_id":"ISmgFMkTmKUxEUjZRoqsEMRG4NChhxU9","client_secret":"[REDACTED]","is_first_party":true,"is_token_endpoint_ip_header_trusted":false,"oidc_conformant":false,"jwt_configuration":{"secret_encoded":false,"lifetime_in_seconds":36000},"signing_keys":[{"cert":"[REDACTED]"}],"sso_disabled":false,"grant_types":["authorization_code","implicit","refresh_token","client_credentials"],"custom_login_page_on":true,"refresh_token":{"rotation_type":"non-rotating","expiration_type":"non-expiring","leeway":0,"token_lifetime":2592000,"infinite_token_lifetime":true,"infinite_idle_token_lifetime":true,"idle_token_lifetime":1296000},"default_organization":{"flows":["client_credentials"],"organization_id":"org_dPrpVR1m8M0wXXq6"}}'
         headers:
             Content-Type:
                 - application/json; charset=utf-8
         status: 200 OK
         code: 200
-        duration: 327.178667ms
+        duration: 324.482083ms
     - id: 7
       request:
         proto: HTTP/1.1
@@ -265,7 +265,7 @@ interactions:
             Content-Type:
                 - application/json
             User-Agent:
-                - Go-Auth0/1.9.0
+                - Go-Auth0/1.10.0
         url: https://terraform-provider-auth0-dev.eu.auth0.com/api/v2/organizations/name/temp-org
         method: GET
       response:
@@ -276,13 +276,13 @@ interactions:
         trailer: {}
         content_length: -1
         uncompressed: true
-        body: '{"id":"org_L9tuSpc9hrPx5Ewe","name":"temp-org","display_name":"temp-org"}'
+        body: '{"id":"org_dPrpVR1m8M0wXXq6","name":"temp-org","display_name":"temp-org"}'
         headers:
             Content-Type:
                 - application/json; charset=utf-8
         status: 200 OK
         code: 200
-        duration: 319.244875ms
+        duration: 323.44225ms
     - id: 8
       request:
         proto: HTTP/1.1
@@ -300,8 +300,8 @@ interactions:
             Content-Type:
                 - application/json
             User-Agent:
-                - Go-Auth0/1.9.0
-        url: https://terraform-provider-auth0-dev.eu.auth0.com/api/v2/organizations/org_L9tuSpc9hrPx5Ewe/enabled_connections?include_totals=true&page=0&per_page=100
+                - Go-Auth0/1.10.0
+        url: https://terraform-provider-auth0-dev.eu.auth0.com/api/v2/organizations/org_dPrpVR1m8M0wXXq6/enabled_connections?include_totals=true&page=0&per_page=100
         method: GET
       response:
         proto: HTTP/2.0
@@ -317,7 +317,7 @@ interactions:
                 - application/json; charset=utf-8
         status: 200 OK
         code: 200
-        duration: 346.711334ms
+        duration: 356.466917ms
     - id: 9
       request:
         proto: HTTP/1.1
@@ -335,8 +335,8 @@ interactions:
             Content-Type:
                 - application/json
             User-Agent:
-                - Go-Auth0/1.9.0
-        url: https://terraform-provider-auth0-dev.eu.auth0.com/api/v2/organizations/org_L9tuSpc9hrPx5Ewe/members?fields=user_id&include_fields=true&include_totals=true&per_page=50&take=100
+                - Go-Auth0/1.10.0
+        url: https://terraform-provider-auth0-dev.eu.auth0.com/api/v2/organizations/org_dPrpVR1m8M0wXXq6/members?fields=user_id&include_fields=true&include_totals=true&per_page=50&take=100
         method: GET
       response:
         proto: HTTP/2.0
@@ -352,7 +352,7 @@ interactions:
                 - application/json; charset=utf-8
         status: 200 OK
         code: 200
-        duration: 315.336958ms
+        duration: 341.36775ms
     - id: 10
       request:
         proto: HTTP/1.1
@@ -370,8 +370,8 @@ interactions:
             Content-Type:
                 - application/json
             User-Agent:
-                - Go-Auth0/1.9.0
-        url: https://terraform-provider-auth0-dev.eu.auth0.com/api/v2/organizations/org_L9tuSpc9hrPx5Ewe
+                - Go-Auth0/1.10.0
+        url: https://terraform-provider-auth0-dev.eu.auth0.com/api/v2/organizations/org_dPrpVR1m8M0wXXq6
         method: GET
       response:
         proto: HTTP/2.0
@@ -381,13 +381,13 @@ interactions:
         trailer: {}
         content_length: -1
         uncompressed: true
-        body: '{"id":"org_L9tuSpc9hrPx5Ewe","name":"temp-org","display_name":"temp-org"}'
+        body: '{"id":"org_dPrpVR1m8M0wXXq6","name":"temp-org","display_name":"temp-org"}'
         headers:
             Content-Type:
                 - application/json; charset=utf-8
         status: 200 OK
         code: 200
-        duration: 356.98725ms
+        duration: 343.33975ms
     - id: 11
       request:
         proto: HTTP/1.1
@@ -405,7 +405,7 @@ interactions:
             Content-Type:
                 - application/json
             User-Agent:
-                - Go-Auth0/1.9.0
+                - Go-Auth0/1.10.0
         url: https://terraform-provider-auth0-dev.eu.auth0.com/api/v2/organizations/name/temp-org
         method: GET
       response:
@@ -416,13 +416,13 @@ interactions:
         trailer: {}
         content_length: -1
         uncompressed: true
-        body: '{"id":"org_L9tuSpc9hrPx5Ewe","name":"temp-org","display_name":"temp-org"}'
+        body: '{"id":"org_dPrpVR1m8M0wXXq6","name":"temp-org","display_name":"temp-org"}'
         headers:
             Content-Type:
                 - application/json; charset=utf-8
         status: 200 OK
         code: 200
-        duration: 333.054625ms
+        duration: 323.056542ms
     - id: 12
       request:
         proto: HTTP/1.1
@@ -440,8 +440,8 @@ interactions:
             Content-Type:
                 - application/json
             User-Agent:
-                - Go-Auth0/1.9.0
-        url: https://terraform-provider-auth0-dev.eu.auth0.com/api/v2/organizations/org_L9tuSpc9hrPx5Ewe/enabled_connections?include_totals=true&page=0&per_page=100
+                - Go-Auth0/1.10.0
+        url: https://terraform-provider-auth0-dev.eu.auth0.com/api/v2/organizations/org_dPrpVR1m8M0wXXq6/enabled_connections?include_totals=true&page=0&per_page=100
         method: GET
       response:
         proto: HTTP/2.0
@@ -457,7 +457,7 @@ interactions:
                 - application/json; charset=utf-8
         status: 200 OK
         code: 200
-        duration: 334.239125ms
+        duration: 314.55ms
     - id: 13
       request:
         proto: HTTP/1.1
@@ -475,8 +475,8 @@ interactions:
             Content-Type:
                 - application/json
             User-Agent:
-                - Go-Auth0/1.9.0
-        url: https://terraform-provider-auth0-dev.eu.auth0.com/api/v2/organizations/org_L9tuSpc9hrPx5Ewe/members?fields=user_id&include_fields=true&include_totals=true&per_page=50&take=100
+                - Go-Auth0/1.10.0
+        url: https://terraform-provider-auth0-dev.eu.auth0.com/api/v2/organizations/org_dPrpVR1m8M0wXXq6/members?fields=user_id&include_fields=true&include_totals=true&per_page=50&take=100
         method: GET
       response:
         proto: HTTP/2.0
@@ -492,7 +492,7 @@ interactions:
                 - application/json; charset=utf-8
         status: 200 OK
         code: 200
-        duration: 373.716375ms
+        duration: 345.482292ms
     - id: 14
       request:
         proto: HTTP/1.1
@@ -510,8 +510,8 @@ interactions:
             Content-Type:
                 - application/json
             User-Agent:
-                - Go-Auth0/1.9.0
-        url: https://terraform-provider-auth0-dev.eu.auth0.com/api/v2/clients/UF2V30gQir0tyP4rqdVH1zm8VaJZDV6O
+                - Go-Auth0/1.10.0
+        url: https://terraform-provider-auth0-dev.eu.auth0.com/api/v2/clients/ISmgFMkTmKUxEUjZRoqsEMRG4NChhxU9
         method: GET
       response:
         proto: HTTP/2.0
@@ -521,13 +521,13 @@ interactions:
         trailer: {}
         content_length: -1
         uncompressed: true
-        body: '{"name":"Acceptance Test - DefaultOrganization - TestAccClientWithDefaultOrganization","client_id":"UF2V30gQir0tyP4rqdVH1zm8VaJZDV6O","client_secret":"[REDACTED]","is_first_party":true,"is_token_endpoint_ip_header_trusted":false,"oidc_conformant":false,"jwt_configuration":{"secret_encoded":false,"lifetime_in_seconds":36000},"signing_keys":[{"cert":"[REDACTED]"}],"sso_disabled":false,"grant_types":["authorization_code","implicit","refresh_token","client_credentials"],"custom_login_page_on":true,"refresh_token":{"rotation_type":"non-rotating","expiration_type":"non-expiring","leeway":0,"token_lifetime":2592000,"infinite_token_lifetime":true,"infinite_idle_token_lifetime":true,"idle_token_lifetime":1296000},"default_organization":{"flows":["client_credentials"],"organization_id":"org_L9tuSpc9hrPx5Ewe"}}'
+        body: '{"name":"Acceptance Test - DefaultOrganization - TestAccClientWithDefaultOrganization","client_id":"ISmgFMkTmKUxEUjZRoqsEMRG4NChhxU9","client_secret":"[REDACTED]","is_first_party":true,"is_token_endpoint_ip_header_trusted":false,"oidc_conformant":false,"jwt_configuration":{"secret_encoded":false,"lifetime_in_seconds":36000},"signing_keys":[{"cert":"[REDACTED]"}],"sso_disabled":false,"grant_types":["authorization_code","implicit","refresh_token","client_credentials"],"custom_login_page_on":true,"refresh_token":{"rotation_type":"non-rotating","expiration_type":"non-expiring","leeway":0,"token_lifetime":2592000,"infinite_token_lifetime":true,"infinite_idle_token_lifetime":true,"idle_token_lifetime":1296000},"default_organization":{"flows":["client_credentials"],"organization_id":"org_dPrpVR1m8M0wXXq6"}}'
         headers:
             Content-Type:
                 - application/json; charset=utf-8
         status: 200 OK
         code: 200
-        duration: 421.9745ms
+        duration: 340.4985ms
     - id: 15
       request:
         proto: HTTP/1.1
@@ -545,8 +545,8 @@ interactions:
             Content-Type:
                 - application/json
             User-Agent:
-                - Go-Auth0/1.9.0
-        url: https://terraform-provider-auth0-dev.eu.auth0.com/api/v2/organizations/org_L9tuSpc9hrPx5Ewe
+                - Go-Auth0/1.10.0
+        url: https://terraform-provider-auth0-dev.eu.auth0.com/api/v2/organizations/org_dPrpVR1m8M0wXXq6
         method: GET
       response:
         proto: HTTP/2.0
@@ -556,13 +556,13 @@ interactions:
         trailer: {}
         content_length: -1
         uncompressed: true
-        body: '{"id":"org_L9tuSpc9hrPx5Ewe","name":"temp-org","display_name":"temp-org"}'
+        body: '{"id":"org_dPrpVR1m8M0wXXq6","name":"temp-org","display_name":"temp-org"}'
         headers:
             Content-Type:
                 - application/json; charset=utf-8
         status: 200 OK
         code: 200
-        duration: 326.383667ms
+        duration: 326.948125ms
     - id: 16
       request:
         proto: HTTP/1.1
@@ -580,8 +580,8 @@ interactions:
             Content-Type:
                 - application/json
             User-Agent:
-                - Go-Auth0/1.9.0
-        url: https://terraform-provider-auth0-dev.eu.auth0.com/api/v2/clients/UF2V30gQir0tyP4rqdVH1zm8VaJZDV6O
+                - Go-Auth0/1.10.0
+        url: https://terraform-provider-auth0-dev.eu.auth0.com/api/v2/clients/ISmgFMkTmKUxEUjZRoqsEMRG4NChhxU9
         method: GET
       response:
         proto: HTTP/2.0
@@ -591,13 +591,13 @@ interactions:
         trailer: {}
         content_length: -1
         uncompressed: true
-        body: '{"name":"Acceptance Test - DefaultOrganization - TestAccClientWithDefaultOrganization","client_id":"UF2V30gQir0tyP4rqdVH1zm8VaJZDV6O","client_secret":"[REDACTED]","is_first_party":true,"is_token_endpoint_ip_header_trusted":false,"oidc_conformant":false,"jwt_configuration":{"secret_encoded":false,"lifetime_in_seconds":36000},"signing_keys":[{"cert":"[REDACTED]"}],"sso_disabled":false,"grant_types":["authorization_code","implicit","refresh_token","client_credentials"],"custom_login_page_on":true,"refresh_token":{"rotation_type":"non-rotating","expiration_type":"non-expiring","leeway":0,"token_lifetime":2592000,"infinite_token_lifetime":true,"infinite_idle_token_lifetime":true,"idle_token_lifetime":1296000},"default_organization":{"flows":["client_credentials"],"organization_id":"org_L9tuSpc9hrPx5Ewe"}}'
+        body: '{"name":"Acceptance Test - DefaultOrganization - TestAccClientWithDefaultOrganization","client_id":"ISmgFMkTmKUxEUjZRoqsEMRG4NChhxU9","client_secret":"[REDACTED]","is_first_party":true,"is_token_endpoint_ip_header_trusted":false,"oidc_conformant":false,"jwt_configuration":{"secret_encoded":false,"lifetime_in_seconds":36000},"signing_keys":[{"cert":"[REDACTED]"}],"sso_disabled":false,"grant_types":["authorization_code","implicit","refresh_token","client_credentials"],"custom_login_page_on":true,"refresh_token":{"rotation_type":"non-rotating","expiration_type":"non-expiring","leeway":0,"token_lifetime":2592000,"infinite_token_lifetime":true,"infinite_idle_token_lifetime":true,"idle_token_lifetime":1296000},"default_organization":{"flows":["client_credentials"],"organization_id":"org_dPrpVR1m8M0wXXq6"}}'
         headers:
             Content-Type:
                 - application/json; charset=utf-8
         status: 200 OK
         code: 200
-        duration: 367.238333ms
+        duration: 341.75475ms
     - id: 17
       request:
         proto: HTTP/1.1
@@ -616,7 +616,7 @@ interactions:
             Content-Type:
                 - application/json
             User-Agent:
-                - Go-Auth0/1.9.0
+                - Go-Auth0/1.10.0
         url: https://terraform-provider-auth0-dev.eu.auth0.com/api/v2/organizations
         method: POST
       response:
@@ -627,13 +627,13 @@ interactions:
         trailer: {}
         content_length: 81
         uncompressed: false
-        body: '{"id":"org_a4BzVtegnDVDuDy9","display_name":"temp-new-org","name":"temp-new-org"}'
+        body: '{"id":"org_q4hg2b1zM3Vp4dKz","display_name":"temp-new-org","name":"temp-new-org"}'
         headers:
             Content-Type:
                 - application/json; charset=utf-8
         status: 201 Created
         code: 201
-        duration: 363.563167ms
+        duration: 328.238916ms
     - id: 18
       request:
         proto: HTTP/1.1
@@ -651,8 +651,8 @@ interactions:
             Content-Type:
                 - application/json
             User-Agent:
-                - Go-Auth0/1.9.0
-        url: https://terraform-provider-auth0-dev.eu.auth0.com/api/v2/organizations/org_L9tuSpc9hrPx5Ewe
+                - Go-Auth0/1.10.0
+        url: https://terraform-provider-auth0-dev.eu.auth0.com/api/v2/organizations/org_dPrpVR1m8M0wXXq6
         method: DELETE
       response:
         proto: HTTP/2.0
@@ -668,7 +668,7 @@ interactions:
                 - application/json; charset=utf-8
         status: 204 No Content
         code: 204
-        duration: 364.001042ms
+        duration: 379.584958ms
     - id: 19
       request:
         proto: HTTP/1.1
@@ -686,8 +686,8 @@ interactions:
             Content-Type:
                 - application/json
             User-Agent:
-                - Go-Auth0/1.9.0
-        url: https://terraform-provider-auth0-dev.eu.auth0.com/api/v2/organizations/org_a4BzVtegnDVDuDy9
+                - Go-Auth0/1.10.0
+        url: https://terraform-provider-auth0-dev.eu.auth0.com/api/v2/organizations/org_q4hg2b1zM3Vp4dKz
         method: GET
       response:
         proto: HTTP/2.0
@@ -697,13 +697,13 @@ interactions:
         trailer: {}
         content_length: -1
         uncompressed: true
-        body: '{"id":"org_a4BzVtegnDVDuDy9","name":"temp-new-org","display_name":"temp-new-org"}'
+        body: '{"id":"org_q4hg2b1zM3Vp4dKz","name":"temp-new-org","display_name":"temp-new-org"}'
         headers:
             Content-Type:
                 - application/json; charset=utf-8
         status: 200 OK
         code: 200
-        duration: 405.514375ms
+        duration: 316.856375ms
     - id: 20
       request:
         proto: HTTP/1.1
@@ -721,7 +721,7 @@ interactions:
             Content-Type:
                 - application/json
             User-Agent:
-                - Go-Auth0/1.9.0
+                - Go-Auth0/1.10.0
         url: https://terraform-provider-auth0-dev.eu.auth0.com/api/v2/organizations/name/temp-new-org
         method: GET
       response:
@@ -732,13 +732,13 @@ interactions:
         trailer: {}
         content_length: -1
         uncompressed: true
-        body: '{"id":"org_a4BzVtegnDVDuDy9","name":"temp-new-org","display_name":"temp-new-org"}'
+        body: '{"id":"org_q4hg2b1zM3Vp4dKz","name":"temp-new-org","display_name":"temp-new-org"}'
         headers:
             Content-Type:
                 - application/json; charset=utf-8
         status: 200 OK
         code: 200
-        duration: 397.822125ms
+        duration: 699.503333ms
     - id: 21
       request:
         proto: HTTP/1.1
@@ -756,8 +756,8 @@ interactions:
             Content-Type:
                 - application/json
             User-Agent:
-                - Go-Auth0/1.9.0
-        url: https://terraform-provider-auth0-dev.eu.auth0.com/api/v2/organizations/org_a4BzVtegnDVDuDy9/enabled_connections?include_totals=true&page=0&per_page=100
+                - Go-Auth0/1.10.0
+        url: https://terraform-provider-auth0-dev.eu.auth0.com/api/v2/organizations/org_q4hg2b1zM3Vp4dKz/enabled_connections?include_totals=true&page=0&per_page=100
         method: GET
       response:
         proto: HTTP/2.0
@@ -773,7 +773,7 @@ interactions:
                 - application/json; charset=utf-8
         status: 200 OK
         code: 200
-        duration: 332.58675ms
+        duration: 300.599917ms
     - id: 22
       request:
         proto: HTTP/1.1
@@ -791,8 +791,8 @@ interactions:
             Content-Type:
                 - application/json
             User-Agent:
-                - Go-Auth0/1.9.0
-        url: https://terraform-provider-auth0-dev.eu.auth0.com/api/v2/organizations/org_a4BzVtegnDVDuDy9/members?fields=user_id&include_fields=true&include_totals=true&per_page=50&take=100
+                - Go-Auth0/1.10.0
+        url: https://terraform-provider-auth0-dev.eu.auth0.com/api/v2/organizations/org_q4hg2b1zM3Vp4dKz/members?fields=user_id&include_fields=true&include_totals=true&per_page=50&take=100
         method: GET
       response:
         proto: HTTP/2.0
@@ -808,7 +808,7 @@ interactions:
                 - application/json; charset=utf-8
         status: 200 OK
         code: 200
-        duration: 308.963459ms
+        duration: 341.503709ms
     - id: 23
       request:
         proto: HTTP/1.1
@@ -821,14 +821,14 @@ interactions:
         remote_addr: ""
         request_uri: ""
         body: |
-            {"name":"Acceptance Test - DefaultOrganization - TestAccClientWithDefaultOrganization","default_organization":{"flows":["client_credentials"],"organization_id":"org_a4BzVtegnDVDuDy9"}}
+            {"name":"Acceptance Test - DefaultOrganization - TestAccClientWithDefaultOrganization","default_organization":{"flows":["client_credentials"],"organization_id":"org_q4hg2b1zM3Vp4dKz"}}
         form: {}
         headers:
             Content-Type:
                 - application/json
             User-Agent:
-                - Go-Auth0/1.9.0
-        url: https://terraform-provider-auth0-dev.eu.auth0.com/api/v2/clients/UF2V30gQir0tyP4rqdVH1zm8VaJZDV6O
+                - Go-Auth0/1.10.0
+        url: https://terraform-provider-auth0-dev.eu.auth0.com/api/v2/clients/ISmgFMkTmKUxEUjZRoqsEMRG4NChhxU9
         method: PATCH
       response:
         proto: HTTP/2.0
@@ -838,13 +838,13 @@ interactions:
         trailer: {}
         content_length: -1
         uncompressed: true
-        body: '{"name":"Acceptance Test - DefaultOrganization - TestAccClientWithDefaultOrganization","client_id":"UF2V30gQir0tyP4rqdVH1zm8VaJZDV6O","client_secret":"[REDACTED]","is_first_party":true,"is_token_endpoint_ip_header_trusted":false,"oidc_conformant":false,"jwt_configuration":{"secret_encoded":false,"lifetime_in_seconds":36000},"signing_keys":[{"cert":"[REDACTED]"}],"sso_disabled":false,"grant_types":["authorization_code","implicit","refresh_token","client_credentials"],"custom_login_page_on":true,"refresh_token":{"rotation_type":"non-rotating","expiration_type":"non-expiring","leeway":0,"token_lifetime":2592000,"infinite_token_lifetime":true,"infinite_idle_token_lifetime":true,"idle_token_lifetime":1296000},"default_organization":{"flows":["client_credentials"],"organization_id":"org_a4BzVtegnDVDuDy9"}}'
+        body: '{"name":"Acceptance Test - DefaultOrganization - TestAccClientWithDefaultOrganization","client_id":"ISmgFMkTmKUxEUjZRoqsEMRG4NChhxU9","client_secret":"[REDACTED]","is_first_party":true,"is_token_endpoint_ip_header_trusted":false,"oidc_conformant":false,"jwt_configuration":{"secret_encoded":false,"lifetime_in_seconds":36000},"signing_keys":[{"cert":"[REDACTED]"}],"sso_disabled":false,"grant_types":["authorization_code","implicit","refresh_token","client_credentials"],"custom_login_page_on":true,"refresh_token":{"rotation_type":"non-rotating","expiration_type":"non-expiring","leeway":0,"token_lifetime":2592000,"infinite_token_lifetime":true,"infinite_idle_token_lifetime":true,"idle_token_lifetime":1296000},"default_organization":{"flows":["client_credentials"],"organization_id":"org_q4hg2b1zM3Vp4dKz"}}'
         headers:
             Content-Type:
                 - application/json; charset=utf-8
         status: 200 OK
         code: 200
-        duration: 349.178584ms
+        duration: 372.165417ms
     - id: 24
       request:
         proto: HTTP/1.1
@@ -862,8 +862,8 @@ interactions:
             Content-Type:
                 - application/json
             User-Agent:
-                - Go-Auth0/1.9.0
-        url: https://terraform-provider-auth0-dev.eu.auth0.com/api/v2/clients/UF2V30gQir0tyP4rqdVH1zm8VaJZDV6O
+                - Go-Auth0/1.10.0
+        url: https://terraform-provider-auth0-dev.eu.auth0.com/api/v2/clients/ISmgFMkTmKUxEUjZRoqsEMRG4NChhxU9
         method: GET
       response:
         proto: HTTP/2.0
@@ -873,13 +873,13 @@ interactions:
         trailer: {}
         content_length: -1
         uncompressed: true
-        body: '{"name":"Acceptance Test - DefaultOrganization - TestAccClientWithDefaultOrganization","client_id":"UF2V30gQir0tyP4rqdVH1zm8VaJZDV6O","client_secret":"[REDACTED]","is_first_party":true,"is_token_endpoint_ip_header_trusted":false,"oidc_conformant":false,"jwt_configuration":{"secret_encoded":false,"lifetime_in_seconds":36000},"signing_keys":[{"cert":"[REDACTED]"}],"sso_disabled":false,"grant_types":["authorization_code","implicit","refresh_token","client_credentials"],"custom_login_page_on":true,"refresh_token":{"rotation_type":"non-rotating","expiration_type":"non-expiring","leeway":0,"token_lifetime":2592000,"infinite_token_lifetime":true,"infinite_idle_token_lifetime":true,"idle_token_lifetime":1296000},"default_organization":{"flows":["client_credentials"],"organization_id":"org_a4BzVtegnDVDuDy9"}}'
+        body: '{"name":"Acceptance Test - DefaultOrganization - TestAccClientWithDefaultOrganization","client_id":"ISmgFMkTmKUxEUjZRoqsEMRG4NChhxU9","client_secret":"[REDACTED]","is_first_party":true,"is_token_endpoint_ip_header_trusted":false,"oidc_conformant":false,"jwt_configuration":{"secret_encoded":false,"lifetime_in_seconds":36000},"signing_keys":[{"cert":"[REDACTED]"}],"sso_disabled":false,"grant_types":["authorization_code","implicit","refresh_token","client_credentials"],"custom_login_page_on":true,"refresh_token":{"rotation_type":"non-rotating","expiration_type":"non-expiring","leeway":0,"token_lifetime":2592000,"infinite_token_lifetime":true,"infinite_idle_token_lifetime":true,"idle_token_lifetime":1296000},"default_organization":{"flows":["client_credentials"],"organization_id":"org_q4hg2b1zM3Vp4dKz"}}'
         headers:
             Content-Type:
                 - application/json; charset=utf-8
         status: 200 OK
         code: 200
-        duration: 366.586167ms
+        duration: 663.170166ms
     - id: 25
       request:
         proto: HTTP/1.1
@@ -897,7 +897,7 @@ interactions:
             Content-Type:
                 - application/json
             User-Agent:
-                - Go-Auth0/1.9.0
+                - Go-Auth0/1.10.0
         url: https://terraform-provider-auth0-dev.eu.auth0.com/api/v2/organizations/name/temp-new-org
         method: GET
       response:
@@ -908,13 +908,13 @@ interactions:
         trailer: {}
         content_length: -1
         uncompressed: true
-        body: '{"id":"org_a4BzVtegnDVDuDy9","name":"temp-new-org","display_name":"temp-new-org"}'
+        body: '{"id":"org_q4hg2b1zM3Vp4dKz","name":"temp-new-org","display_name":"temp-new-org"}'
         headers:
             Content-Type:
                 - application/json; charset=utf-8
         status: 200 OK
         code: 200
-        duration: 338.95425ms
+        duration: 330.746583ms
     - id: 26
       request:
         proto: HTTP/1.1
@@ -932,8 +932,8 @@ interactions:
             Content-Type:
                 - application/json
             User-Agent:
-                - Go-Auth0/1.9.0
-        url: https://terraform-provider-auth0-dev.eu.auth0.com/api/v2/organizations/org_a4BzVtegnDVDuDy9/enabled_connections?include_totals=true&page=0&per_page=100
+                - Go-Auth0/1.10.0
+        url: https://terraform-provider-auth0-dev.eu.auth0.com/api/v2/organizations/org_q4hg2b1zM3Vp4dKz/enabled_connections?include_totals=true&page=0&per_page=100
         method: GET
       response:
         proto: HTTP/2.0
@@ -949,7 +949,7 @@ interactions:
                 - application/json; charset=utf-8
         status: 200 OK
         code: 200
-        duration: 348.369542ms
+        duration: 334.561083ms
     - id: 27
       request:
         proto: HTTP/1.1
@@ -967,8 +967,8 @@ interactions:
             Content-Type:
                 - application/json
             User-Agent:
-                - Go-Auth0/1.9.0
-        url: https://terraform-provider-auth0-dev.eu.auth0.com/api/v2/organizations/org_a4BzVtegnDVDuDy9/members?fields=user_id&include_fields=true&include_totals=true&per_page=50&take=100
+                - Go-Auth0/1.10.0
+        url: https://terraform-provider-auth0-dev.eu.auth0.com/api/v2/organizations/org_q4hg2b1zM3Vp4dKz/members?fields=user_id&include_fields=true&include_totals=true&per_page=50&take=100
         method: GET
       response:
         proto: HTTP/2.0
@@ -984,7 +984,7 @@ interactions:
                 - application/json; charset=utf-8
         status: 200 OK
         code: 200
-        duration: 464.628208ms
+        duration: 324.352ms
     - id: 28
       request:
         proto: HTTP/1.1
@@ -1002,8 +1002,8 @@ interactions:
             Content-Type:
                 - application/json
             User-Agent:
-                - Go-Auth0/1.9.0
-        url: https://terraform-provider-auth0-dev.eu.auth0.com/api/v2/organizations/org_a4BzVtegnDVDuDy9
+                - Go-Auth0/1.10.0
+        url: https://terraform-provider-auth0-dev.eu.auth0.com/api/v2/organizations/org_q4hg2b1zM3Vp4dKz
         method: GET
       response:
         proto: HTTP/2.0
@@ -1013,13 +1013,13 @@ interactions:
         trailer: {}
         content_length: -1
         uncompressed: true
-        body: '{"id":"org_a4BzVtegnDVDuDy9","name":"temp-new-org","display_name":"temp-new-org"}'
+        body: '{"id":"org_q4hg2b1zM3Vp4dKz","name":"temp-new-org","display_name":"temp-new-org"}'
         headers:
             Content-Type:
                 - application/json; charset=utf-8
         status: 200 OK
         code: 200
-        duration: 322.3335ms
+        duration: 306.341417ms
     - id: 29
       request:
         proto: HTTP/1.1
@@ -1037,7 +1037,7 @@ interactions:
             Content-Type:
                 - application/json
             User-Agent:
-                - Go-Auth0/1.9.0
+                - Go-Auth0/1.10.0
         url: https://terraform-provider-auth0-dev.eu.auth0.com/api/v2/organizations/name/temp-new-org
         method: GET
       response:
@@ -1048,13 +1048,13 @@ interactions:
         trailer: {}
         content_length: -1
         uncompressed: true
-        body: '{"id":"org_a4BzVtegnDVDuDy9","name":"temp-new-org","display_name":"temp-new-org"}'
+        body: '{"id":"org_q4hg2b1zM3Vp4dKz","name":"temp-new-org","display_name":"temp-new-org"}'
         headers:
             Content-Type:
                 - application/json; charset=utf-8
         status: 200 OK
         code: 200
-        duration: 312.33325ms
+        duration: 375.709834ms
     - id: 30
       request:
         proto: HTTP/1.1
@@ -1072,8 +1072,8 @@ interactions:
             Content-Type:
                 - application/json
             User-Agent:
-                - Go-Auth0/1.9.0
-        url: https://terraform-provider-auth0-dev.eu.auth0.com/api/v2/organizations/org_a4BzVtegnDVDuDy9/enabled_connections?include_totals=true&page=0&per_page=100
+                - Go-Auth0/1.10.0
+        url: https://terraform-provider-auth0-dev.eu.auth0.com/api/v2/organizations/org_q4hg2b1zM3Vp4dKz/enabled_connections?include_totals=true&page=0&per_page=100
         method: GET
       response:
         proto: HTTP/2.0
@@ -1089,7 +1089,7 @@ interactions:
                 - application/json; charset=utf-8
         status: 200 OK
         code: 200
-        duration: 334.045958ms
+        duration: 325.143375ms
     - id: 31
       request:
         proto: HTTP/1.1
@@ -1107,8 +1107,8 @@ interactions:
             Content-Type:
                 - application/json
             User-Agent:
-                - Go-Auth0/1.9.0
-        url: https://terraform-provider-auth0-dev.eu.auth0.com/api/v2/organizations/org_a4BzVtegnDVDuDy9/members?fields=user_id&include_fields=true&include_totals=true&per_page=50&take=100
+                - Go-Auth0/1.10.0
+        url: https://terraform-provider-auth0-dev.eu.auth0.com/api/v2/organizations/org_q4hg2b1zM3Vp4dKz/members?fields=user_id&include_fields=true&include_totals=true&per_page=50&take=100
         method: GET
       response:
         proto: HTTP/2.0
@@ -1124,7 +1124,7 @@ interactions:
                 - application/json; charset=utf-8
         status: 200 OK
         code: 200
-        duration: 316.074625ms
+        duration: 540.496375ms
     - id: 32
       request:
         proto: HTTP/1.1
@@ -1142,8 +1142,8 @@ interactions:
             Content-Type:
                 - application/json
             User-Agent:
-                - Go-Auth0/1.9.0
-        url: https://terraform-provider-auth0-dev.eu.auth0.com/api/v2/clients/UF2V30gQir0tyP4rqdVH1zm8VaJZDV6O
+                - Go-Auth0/1.10.0
+        url: https://terraform-provider-auth0-dev.eu.auth0.com/api/v2/clients/ISmgFMkTmKUxEUjZRoqsEMRG4NChhxU9
         method: GET
       response:
         proto: HTTP/2.0
@@ -1153,13 +1153,13 @@ interactions:
         trailer: {}
         content_length: -1
         uncompressed: true
-        body: '{"name":"Acceptance Test - DefaultOrganization - TestAccClientWithDefaultOrganization","client_id":"UF2V30gQir0tyP4rqdVH1zm8VaJZDV6O","client_secret":"[REDACTED]","is_first_party":true,"is_token_endpoint_ip_header_trusted":false,"oidc_conformant":false,"jwt_configuration":{"secret_encoded":false,"lifetime_in_seconds":36000},"signing_keys":[{"cert":"[REDACTED]"}],"sso_disabled":false,"grant_types":["authorization_code","implicit","refresh_token","client_credentials"],"custom_login_page_on":true,"refresh_token":{"rotation_type":"non-rotating","expiration_type":"non-expiring","leeway":0,"token_lifetime":2592000,"infinite_token_lifetime":true,"infinite_idle_token_lifetime":true,"idle_token_lifetime":1296000},"default_organization":{"flows":["client_credentials"],"organization_id":"org_a4BzVtegnDVDuDy9"}}'
+        body: '{"name":"Acceptance Test - DefaultOrganization - TestAccClientWithDefaultOrganization","client_id":"ISmgFMkTmKUxEUjZRoqsEMRG4NChhxU9","client_secret":"[REDACTED]","is_first_party":true,"is_token_endpoint_ip_header_trusted":false,"oidc_conformant":false,"jwt_configuration":{"secret_encoded":false,"lifetime_in_seconds":36000},"signing_keys":[{"cert":"[REDACTED]"}],"sso_disabled":false,"grant_types":["authorization_code","implicit","refresh_token","client_credentials"],"custom_login_page_on":true,"refresh_token":{"rotation_type":"non-rotating","expiration_type":"non-expiring","leeway":0,"token_lifetime":2592000,"infinite_token_lifetime":true,"infinite_idle_token_lifetime":true,"idle_token_lifetime":1296000},"default_organization":{"flows":["client_credentials"],"organization_id":"org_q4hg2b1zM3Vp4dKz"}}'
         headers:
             Content-Type:
                 - application/json; charset=utf-8
         status: 200 OK
         code: 200
-        duration: 319.822792ms
+        duration: 356.207ms
     - id: 33
       request:
         proto: HTTP/1.1
@@ -1177,8 +1177,8 @@ interactions:
             Content-Type:
                 - application/json
             User-Agent:
-                - Go-Auth0/1.9.0
-        url: https://terraform-provider-auth0-dev.eu.auth0.com/api/v2/organizations/org_a4BzVtegnDVDuDy9
+                - Go-Auth0/1.10.0
+        url: https://terraform-provider-auth0-dev.eu.auth0.com/api/v2/organizations/org_q4hg2b1zM3Vp4dKz
         method: GET
       response:
         proto: HTTP/2.0
@@ -1188,13 +1188,13 @@ interactions:
         trailer: {}
         content_length: -1
         uncompressed: true
-        body: '{"id":"org_a4BzVtegnDVDuDy9","name":"temp-new-org","display_name":"temp-new-org"}'
+        body: '{"id":"org_q4hg2b1zM3Vp4dKz","name":"temp-new-org","display_name":"temp-new-org"}'
         headers:
             Content-Type:
                 - application/json; charset=utf-8
         status: 200 OK
         code: 200
-        duration: 329.676167ms
+        duration: 298.019084ms
     - id: 34
       request:
         proto: HTTP/1.1
@@ -1212,8 +1212,8 @@ interactions:
             Content-Type:
                 - application/json
             User-Agent:
-                - Go-Auth0/1.9.0
-        url: https://terraform-provider-auth0-dev.eu.auth0.com/api/v2/clients/UF2V30gQir0tyP4rqdVH1zm8VaJZDV6O
+                - Go-Auth0/1.10.0
+        url: https://terraform-provider-auth0-dev.eu.auth0.com/api/v2/clients/ISmgFMkTmKUxEUjZRoqsEMRG4NChhxU9
         method: GET
       response:
         proto: HTTP/2.0
@@ -1223,13 +1223,13 @@ interactions:
         trailer: {}
         content_length: -1
         uncompressed: true
-        body: '{"name":"Acceptance Test - DefaultOrganization - TestAccClientWithDefaultOrganization","client_id":"UF2V30gQir0tyP4rqdVH1zm8VaJZDV6O","client_secret":"[REDACTED]","is_first_party":true,"is_token_endpoint_ip_header_trusted":false,"oidc_conformant":false,"jwt_configuration":{"secret_encoded":false,"lifetime_in_seconds":36000},"signing_keys":[{"cert":"[REDACTED]"}],"sso_disabled":false,"grant_types":["authorization_code","implicit","refresh_token","client_credentials"],"custom_login_page_on":true,"refresh_token":{"rotation_type":"non-rotating","expiration_type":"non-expiring","leeway":0,"token_lifetime":2592000,"infinite_token_lifetime":true,"infinite_idle_token_lifetime":true,"idle_token_lifetime":1296000},"default_organization":{"flows":["client_credentials"],"organization_id":"org_a4BzVtegnDVDuDy9"}}'
+        body: '{"name":"Acceptance Test - DefaultOrganization - TestAccClientWithDefaultOrganization","client_id":"ISmgFMkTmKUxEUjZRoqsEMRG4NChhxU9","client_secret":"[REDACTED]","is_first_party":true,"is_token_endpoint_ip_header_trusted":false,"oidc_conformant":false,"jwt_configuration":{"secret_encoded":false,"lifetime_in_seconds":36000},"signing_keys":[{"cert":"[REDACTED]"}],"sso_disabled":false,"grant_types":["authorization_code","implicit","refresh_token","client_credentials"],"custom_login_page_on":true,"refresh_token":{"rotation_type":"non-rotating","expiration_type":"non-expiring","leeway":0,"token_lifetime":2592000,"infinite_token_lifetime":true,"infinite_idle_token_lifetime":true,"idle_token_lifetime":1296000},"default_organization":{"flows":["client_credentials"],"organization_id":"org_q4hg2b1zM3Vp4dKz"}}'
         headers:
             Content-Type:
                 - application/json; charset=utf-8
         status: 200 OK
         code: 200
-        duration: 328.713916ms
+        duration: 306.475ms
     - id: 35
       request:
         proto: HTTP/1.1
@@ -1247,8 +1247,8 @@ interactions:
             Content-Type:
                 - application/json
             User-Agent:
-                - Go-Auth0/1.9.0
-        url: https://terraform-provider-auth0-dev.eu.auth0.com/api/v2/organizations/org_a4BzVtegnDVDuDy9
+                - Go-Auth0/1.10.0
+        url: https://terraform-provider-auth0-dev.eu.auth0.com/api/v2/organizations/org_q4hg2b1zM3Vp4dKz
         method: DELETE
       response:
         proto: HTTP/2.0
@@ -1264,27 +1264,27 @@ interactions:
                 - application/json; charset=utf-8
         status: 204 No Content
         code: 204
-        duration: 321.1195ms
+        duration: 301.706584ms
     - id: 36
       request:
         proto: HTTP/1.1
         proto_major: 1
         proto_minor: 1
-        content_length: 116
+        content_length: 88
         transfer_encoding: []
         trailer: {}
         host: terraform-provider-auth0-dev.eu.auth0.com
         remote_addr: ""
         request_uri: ""
         body: |
-            {"name":"Acceptance Test - DefaultOrganization - TestAccClientWithDefaultOrganization","default_organization":null}
+            {"name":"Acceptance Test - DefaultOrganization - TestAccClientWithDefaultOrganization"}
         form: {}
         headers:
             Content-Type:
                 - application/json
             User-Agent:
-                - Go-Auth0/1.9.0
-        url: https://terraform-provider-auth0-dev.eu.auth0.com/api/v2/clients/UF2V30gQir0tyP4rqdVH1zm8VaJZDV6O
+                - Go-Auth0/1.10.0
+        url: https://terraform-provider-auth0-dev.eu.auth0.com/api/v2/clients/ISmgFMkTmKUxEUjZRoqsEMRG4NChhxU9
         method: PATCH
       response:
         proto: HTTP/2.0
@@ -1294,14 +1294,50 @@ interactions:
         trailer: {}
         content_length: -1
         uncompressed: true
-        body: '{"name":"Acceptance Test - DefaultOrganization - TestAccClientWithDefaultOrganization","client_id":"UF2V30gQir0tyP4rqdVH1zm8VaJZDV6O","client_secret":"[REDACTED]","is_first_party":true,"is_token_endpoint_ip_header_trusted":false,"oidc_conformant":false,"jwt_configuration":{"secret_encoded":false,"lifetime_in_seconds":36000},"signing_keys":[{"cert":"[REDACTED]"}],"sso_disabled":false,"grant_types":["authorization_code","implicit","refresh_token","client_credentials"],"custom_login_page_on":true,"refresh_token":{"rotation_type":"non-rotating","expiration_type":"non-expiring","leeway":0,"token_lifetime":2592000,"infinite_token_lifetime":true,"infinite_idle_token_lifetime":true,"idle_token_lifetime":1296000}}'
+        body: '{"name":"Acceptance Test - DefaultOrganization - TestAccClientWithDefaultOrganization","client_id":"ISmgFMkTmKUxEUjZRoqsEMRG4NChhxU9","client_secret":"[REDACTED]","is_first_party":true,"is_token_endpoint_ip_header_trusted":false,"oidc_conformant":false,"jwt_configuration":{"secret_encoded":false,"lifetime_in_seconds":36000},"signing_keys":[{"cert":"[REDACTED]"}],"sso_disabled":false,"grant_types":["authorization_code","implicit","refresh_token","client_credentials"],"custom_login_page_on":true,"refresh_token":{"rotation_type":"non-rotating","expiration_type":"non-expiring","leeway":0,"token_lifetime":2592000,"infinite_token_lifetime":true,"infinite_idle_token_lifetime":true,"idle_token_lifetime":1296000},"default_organization":{"flows":["client_credentials"],"organization_id":"org_q4hg2b1zM3Vp4dKz"}}'
         headers:
             Content-Type:
                 - application/json; charset=utf-8
         status: 200 OK
         code: 200
-        duration: 375.951416ms
+        duration: 339.009083ms
     - id: 37
+      request:
+        proto: HTTP/1.1
+        proto_major: 1
+        proto_minor: 1
+        content_length: 30
+        transfer_encoding: []
+        trailer: {}
+        host: terraform-provider-auth0-dev.eu.auth0.com
+        remote_addr: ""
+        request_uri: ""
+        body: |
+            {"default_organization":null}
+        form: {}
+        headers:
+            Content-Type:
+                - application/json
+            User-Agent:
+                - Go-Auth0/1.10.0
+        url: https://terraform-provider-auth0-dev.eu.auth0.com/api/v2/clients/ISmgFMkTmKUxEUjZRoqsEMRG4NChhxU9
+        method: PATCH
+      response:
+        proto: HTTP/2.0
+        proto_major: 2
+        proto_minor: 0
+        transfer_encoding: []
+        trailer: {}
+        content_length: -1
+        uncompressed: true
+        body: '{"name":"Acceptance Test - DefaultOrganization - TestAccClientWithDefaultOrganization","client_id":"ISmgFMkTmKUxEUjZRoqsEMRG4NChhxU9","client_secret":"[REDACTED]","is_first_party":true,"is_token_endpoint_ip_header_trusted":false,"oidc_conformant":false,"jwt_configuration":{"secret_encoded":false,"lifetime_in_seconds":36000},"signing_keys":[{"cert":"[REDACTED]"}],"sso_disabled":false,"grant_types":["authorization_code","implicit","refresh_token","client_credentials"],"custom_login_page_on":true,"refresh_token":{"rotation_type":"non-rotating","expiration_type":"non-expiring","leeway":0,"token_lifetime":2592000,"infinite_token_lifetime":true,"infinite_idle_token_lifetime":true,"idle_token_lifetime":1296000}}'
+        headers:
+            Content-Type:
+                - application/json; charset=utf-8
+        status: 200 OK
+        code: 200
+        duration: 424.610708ms
+    - id: 38
       request:
         proto: HTTP/1.1
         proto_major: 1
@@ -1318,8 +1354,8 @@ interactions:
             Content-Type:
                 - application/json
             User-Agent:
-                - Go-Auth0/1.9.0
-        url: https://terraform-provider-auth0-dev.eu.auth0.com/api/v2/clients/UF2V30gQir0tyP4rqdVH1zm8VaJZDV6O
+                - Go-Auth0/1.10.0
+        url: https://terraform-provider-auth0-dev.eu.auth0.com/api/v2/clients/ISmgFMkTmKUxEUjZRoqsEMRG4NChhxU9
         method: GET
       response:
         proto: HTTP/2.0
@@ -1329,14 +1365,14 @@ interactions:
         trailer: {}
         content_length: -1
         uncompressed: true
-        body: '{"name":"Acceptance Test - DefaultOrganization - TestAccClientWithDefaultOrganization","client_id":"UF2V30gQir0tyP4rqdVH1zm8VaJZDV6O","client_secret":"[REDACTED]","is_first_party":true,"is_token_endpoint_ip_header_trusted":false,"oidc_conformant":false,"jwt_configuration":{"secret_encoded":false,"lifetime_in_seconds":36000},"signing_keys":[{"cert":"[REDACTED]"}],"sso_disabled":false,"grant_types":["authorization_code","implicit","refresh_token","client_credentials"],"custom_login_page_on":true,"refresh_token":{"rotation_type":"non-rotating","expiration_type":"non-expiring","leeway":0,"token_lifetime":2592000,"infinite_token_lifetime":true,"infinite_idle_token_lifetime":true,"idle_token_lifetime":1296000}}'
+        body: '{"name":"Acceptance Test - DefaultOrganization - TestAccClientWithDefaultOrganization","client_id":"ISmgFMkTmKUxEUjZRoqsEMRG4NChhxU9","client_secret":"[REDACTED]","is_first_party":true,"is_token_endpoint_ip_header_trusted":false,"oidc_conformant":false,"jwt_configuration":{"secret_encoded":false,"lifetime_in_seconds":36000},"signing_keys":[{"cert":"[REDACTED]"}],"sso_disabled":false,"grant_types":["authorization_code","implicit","refresh_token","client_credentials"],"custom_login_page_on":true,"refresh_token":{"rotation_type":"non-rotating","expiration_type":"non-expiring","leeway":0,"token_lifetime":2592000,"infinite_token_lifetime":true,"infinite_idle_token_lifetime":true,"idle_token_lifetime":1296000}}'
         headers:
             Content-Type:
                 - application/json; charset=utf-8
         status: 200 OK
         code: 200
-        duration: 325.905459ms
-    - id: 38
+        duration: 332.0195ms
+    - id: 39
       request:
         proto: HTTP/1.1
         proto_major: 1
@@ -1353,8 +1389,8 @@ interactions:
             Content-Type:
                 - application/json
             User-Agent:
-                - Go-Auth0/1.9.0
-        url: https://terraform-provider-auth0-dev.eu.auth0.com/api/v2/clients/UF2V30gQir0tyP4rqdVH1zm8VaJZDV6O
+                - Go-Auth0/1.10.0
+        url: https://terraform-provider-auth0-dev.eu.auth0.com/api/v2/clients/ISmgFMkTmKUxEUjZRoqsEMRG4NChhxU9
         method: GET
       response:
         proto: HTTP/2.0
@@ -1364,14 +1400,156 @@ interactions:
         trailer: {}
         content_length: -1
         uncompressed: true
-        body: '{"name":"Acceptance Test - DefaultOrganization - TestAccClientWithDefaultOrganization","client_id":"UF2V30gQir0tyP4rqdVH1zm8VaJZDV6O","client_secret":"[REDACTED]","is_first_party":true,"is_token_endpoint_ip_header_trusted":false,"oidc_conformant":false,"jwt_configuration":{"secret_encoded":false,"lifetime_in_seconds":36000},"signing_keys":[{"cert":"[REDACTED]"}],"sso_disabled":false,"grant_types":["authorization_code","implicit","refresh_token","client_credentials"],"custom_login_page_on":true,"refresh_token":{"rotation_type":"non-rotating","expiration_type":"non-expiring","leeway":0,"token_lifetime":2592000,"infinite_token_lifetime":true,"infinite_idle_token_lifetime":true,"idle_token_lifetime":1296000}}'
+        body: '{"name":"Acceptance Test - DefaultOrganization - TestAccClientWithDefaultOrganization","client_id":"ISmgFMkTmKUxEUjZRoqsEMRG4NChhxU9","client_secret":"[REDACTED]","is_first_party":true,"is_token_endpoint_ip_header_trusted":false,"oidc_conformant":false,"jwt_configuration":{"secret_encoded":false,"lifetime_in_seconds":36000},"signing_keys":[{"cert":"[REDACTED]"}],"sso_disabled":false,"grant_types":["authorization_code","implicit","refresh_token","client_credentials"],"custom_login_page_on":true,"refresh_token":{"rotation_type":"non-rotating","expiration_type":"non-expiring","leeway":0,"token_lifetime":2592000,"infinite_token_lifetime":true,"infinite_idle_token_lifetime":true,"idle_token_lifetime":1296000}}'
         headers:
             Content-Type:
                 - application/json; charset=utf-8
         status: 200 OK
         code: 200
-        duration: 382.925125ms
-    - id: 39
+        duration: 321.18775ms
+    - id: 40
+      request:
+        proto: HTTP/1.1
+        proto_major: 1
+        proto_minor: 1
+        content_length: 0
+        transfer_encoding: []
+        trailer: {}
+        host: terraform-provider-auth0-dev.eu.auth0.com
+        remote_addr: ""
+        request_uri: ""
+        body: ""
+        form: {}
+        headers:
+            Content-Type:
+                - application/json
+            User-Agent:
+                - Go-Auth0/1.10.0
+        url: https://terraform-provider-auth0-dev.eu.auth0.com/api/v2/clients/ISmgFMkTmKUxEUjZRoqsEMRG4NChhxU9
+        method: GET
+      response:
+        proto: HTTP/2.0
+        proto_major: 2
+        proto_minor: 0
+        transfer_encoding: []
+        trailer: {}
+        content_length: -1
+        uncompressed: true
+        body: '{"name":"Acceptance Test - DefaultOrganization - TestAccClientWithDefaultOrganization","client_id":"ISmgFMkTmKUxEUjZRoqsEMRG4NChhxU9","client_secret":"[REDACTED]","is_first_party":true,"is_token_endpoint_ip_header_trusted":false,"oidc_conformant":false,"jwt_configuration":{"secret_encoded":false,"lifetime_in_seconds":36000},"signing_keys":[{"cert":"[REDACTED]"}],"sso_disabled":false,"grant_types":["authorization_code","implicit","refresh_token","client_credentials"],"custom_login_page_on":true,"refresh_token":{"rotation_type":"non-rotating","expiration_type":"non-expiring","leeway":0,"token_lifetime":2592000,"infinite_token_lifetime":true,"infinite_idle_token_lifetime":true,"idle_token_lifetime":1296000}}'
+        headers:
+            Content-Type:
+                - application/json; charset=utf-8
+        status: 200 OK
+        code: 200
+        duration: 355.791666ms
+    - id: 41
+      request:
+        proto: HTTP/1.1
+        proto_major: 1
+        proto_minor: 1
+        content_length: 144
+        transfer_encoding: []
+        trailer: {}
+        host: terraform-provider-auth0-dev.eu.auth0.com
+        remote_addr: ""
+        request_uri: ""
+        body: |
+            {"name":"Acceptance Test - DefaultOrganization - TestAccClientWithDefaultOrganization","default_organization":{"flows":["client_credentials"]}}
+        form: {}
+        headers:
+            Content-Type:
+                - application/json
+            User-Agent:
+                - Go-Auth0/1.10.0
+        url: https://terraform-provider-auth0-dev.eu.auth0.com/api/v2/clients/ISmgFMkTmKUxEUjZRoqsEMRG4NChhxU9
+        method: PATCH
+      response:
+        proto: HTTP/2.0
+        proto_major: 2
+        proto_minor: 0
+        transfer_encoding: []
+        trailer: {}
+        content_length: 232
+        uncompressed: false
+        body: '{"signing_keys":[{"cert":"[REDACTED]"}]}'
+        headers:
+            Content-Type:
+                - application/json; charset=utf-8
+        status: 400 Bad Request
+        code: 400
+        duration: 335.359875ms
+    - id: 42
+      request:
+        proto: HTTP/1.1
+        proto_major: 1
+        proto_minor: 1
+        content_length: 0
+        transfer_encoding: []
+        trailer: {}
+        host: terraform-provider-auth0-dev.eu.auth0.com
+        remote_addr: ""
+        request_uri: ""
+        body: ""
+        form: {}
+        headers:
+            Content-Type:
+                - application/json
+            User-Agent:
+                - Go-Auth0/1.10.0
+        url: https://terraform-provider-auth0-dev.eu.auth0.com/api/v2/clients/ISmgFMkTmKUxEUjZRoqsEMRG4NChhxU9
+        method: GET
+      response:
+        proto: HTTP/2.0
+        proto_major: 2
+        proto_minor: 0
+        transfer_encoding: []
+        trailer: {}
+        content_length: -1
+        uncompressed: true
+        body: '{"name":"Acceptance Test - DefaultOrganization - TestAccClientWithDefaultOrganization","client_id":"ISmgFMkTmKUxEUjZRoqsEMRG4NChhxU9","client_secret":"[REDACTED]","is_first_party":true,"is_token_endpoint_ip_header_trusted":false,"oidc_conformant":false,"jwt_configuration":{"secret_encoded":false,"lifetime_in_seconds":36000},"signing_keys":[{"cert":"[REDACTED]"}],"sso_disabled":false,"grant_types":["authorization_code","implicit","refresh_token","client_credentials"],"custom_login_page_on":true,"refresh_token":{"rotation_type":"non-rotating","expiration_type":"non-expiring","leeway":0,"token_lifetime":2592000,"infinite_token_lifetime":true,"infinite_idle_token_lifetime":true,"idle_token_lifetime":1296000}}'
+        headers:
+            Content-Type:
+                - application/json; charset=utf-8
+        status: 200 OK
+        code: 200
+        duration: 1.32539725s
+    - id: 43
+      request:
+        proto: HTTP/1.1
+        proto_major: 1
+        proto_minor: 1
+        content_length: 154
+        transfer_encoding: []
+        trailer: {}
+        host: terraform-provider-auth0-dev.eu.auth0.com
+        remote_addr: ""
+        request_uri: ""
+        body: |
+            {"name":"Acceptance Test - DefaultOrganization - TestAccClientWithDefaultOrganization","default_organization":{"organization_id":"org_z5YvxlXPO0NspoIa"}}
+        form: {}
+        headers:
+            Content-Type:
+                - application/json
+            User-Agent:
+                - Go-Auth0/1.10.0
+        url: https://terraform-provider-auth0-dev.eu.auth0.com/api/v2/clients/ISmgFMkTmKUxEUjZRoqsEMRG4NChhxU9
+        method: PATCH
+      response:
+        proto: HTTP/2.0
+        proto_major: 2
+        proto_minor: 0
+        transfer_encoding: []
+        trailer: {}
+        content_length: 222
+        uncompressed: false
+        body: '{"signing_keys":[{"cert":"[REDACTED]"}]}'
+        headers:
+            Content-Type:
+                - application/json; charset=utf-8
+        status: 400 Bad Request
+        code: 400
+        duration: 341.599708ms
+    - id: 44
       request:
         proto: HTTP/1.1
         proto_major: 1
@@ -1388,8 +1566,8 @@ interactions:
             Content-Type:
                 - application/json
             User-Agent:
-                - Go-Auth0/1.9.0
-        url: https://terraform-provider-auth0-dev.eu.auth0.com/api/v2/clients/UF2V30gQir0tyP4rqdVH1zm8VaJZDV6O
+                - Go-Auth0/1.10.0
+        url: https://terraform-provider-auth0-dev.eu.auth0.com/api/v2/clients/ISmgFMkTmKUxEUjZRoqsEMRG4NChhxU9
         method: DELETE
       response:
         proto: HTTP/2.0
@@ -1405,4 +1583,4 @@ interactions:
                 - application/json; charset=utf-8
         status: 204 No Content
         code: 204
-        duration: 404.244417ms
+        duration: 381.433125ms