diff --git a/src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages.Client/Client.razor b/src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages.Client/Client.razor
index 06e0e5812..f25d3928e 100644
--- a/src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages.Client/Client.razor
+++ b/src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages.Client/Client.razor
@@ -219,16 +219,19 @@ else
             {
                 <ClientUrisPanel Model="@Model" />
             }
-            <div id="providers" class="card mb-3">
-                <div class="card-header">
-                    <div class="row">
-                        <h5 class="col">@Localizer["External provider restrictions"]</h5>
+            @if (!Model.IsClientCredentialOnly())
+            {
+                <div id="providers" class="card mb-3">
+                    <div class="card-header">
+                        <div class="row">
+                            <h5 class="col">@Localizer["External provider restrictions"]</h5>
+                        </div>
+                    </div>
+                    <div class="card-body">
+                        <ClientIdpRestrictions Model="@Model" />
                     </div>
                 </div>
-                <div class="card-body">
-                    <ClientIdpRestrictions Model="@Model" />
-                </div>
-            </div>
+            }
             <div id="scopes" class="card mb-3">
                 <div class="card-header">
                     <div class="row">
diff --git a/src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages.Client/Components/ClientTokens.razor b/src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages.Client/Components/ClientTokens.razor
index 90534688c..852099610 100644
--- a/src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages.Client/Components/ClientTokens.razor
+++ b/src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages.Client/Components/ClientTokens.razor
@@ -70,28 +70,25 @@
             }
         </div>
     </div>
-    @if (_showAllOptions || Model.HasUser())
-    {
-        <div class="mb-3 row">
-            <label class="col col-form-label" for="id-token">
-                @Localizer["id token lifetime"]
-            </label>
-            <div class="col-lg-8 col-sm-12">
-                <AuthorizedToken Name="id-token" QuickValues="_idTokenQuickValues" @bind-Value="@Model.IdentityTokenLifetime" TokenValueChanged="TokenChanded" />
-                <div>
-                    <AuthorizeCheckbox Name="include-claims" Label="@Localizer["always include user claims in id token"]" @bind-Value="@Model.AlwaysIncludeUserClaimsInIdToken" />
-                </div>
+    <div class="mb-3 row">
+        <label class="col col-form-label" for="id-token">
+            @Localizer["id token lifetime"]
+        </label>
+        <div class="col-lg-8 col-sm-12">
+            <AuthorizedToken Name="id-token" QuickValues="_idTokenQuickValues" @bind-Value="@Model.IdentityTokenLifetime" TokenValueChanged="TokenChanded" />
+            <div>
+                <AuthorizeCheckbox Name="include-claims" Label="@Localizer["always include user claims in id token"]" @bind-Value="@Model.AlwaysIncludeUserClaimsInIdToken" />
             </div>
         </div>
-        <div class="mb-3 row">
-            <label class="col col-form-label" for="salt">
-                @Localizer["pairwise subject salt"]
-            </label>
-            <div class="col-lg-8 col-sm-12">
-                <AuthorizeText Id="salt" @bind-Value="@Model.PairWiseSubjectSalt" MaxLength="200" />
-            </div>
+    </div>
+    <div class="mb-3 row">
+        <label class="col col-form-label" for="salt">
+            @Localizer["pairwise subject salt"]
+        </label>
+        <div class="col-lg-8 col-sm-12">
+            <AuthorizeText Id="salt" @bind-Value="@Model.PairWiseSubjectSalt" MaxLength="200" />
         </div>
-    }
+    </div>
     @if (_showAllOptions || Model.CanUseRefreshToken())
     {
         <div class="mb-3 row">
diff --git a/src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages.Client/Extensions/ClientExtensions.cs b/src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages.Client/Extensions/ClientExtensions.cs
index 424922778..e23497af3 100644
--- a/src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages.Client/Extensions/ClientExtensions.cs
+++ b/src/BlazorApp/Aguacongas.TheIdServer.BlazorApp.Pages.Client/Extensions/ClientExtensions.cs
@@ -7,6 +7,11 @@ namespace Aguacongas.TheIdServer.BlazorApp.Pages.Client.Extentions
 {
     public static class ClientExtensions
     {
+        public static bool IsClientCredentialOnly(this IdentityServer.Store.Entity.Client client)
+        {
+            return client.AllowedGrantTypes.All(g => g.GrantType == "client_credentials");
+        }
+
         public static bool IsWebClient(this IdentityServer.Store.Entity.Client client)
         {
             return client.ProtocolType == "wsfed" ||