diff --git a/app/MindWork AI Studio/Components/Settings/SettingsPanelEmbeddings.razor b/app/MindWork AI Studio/Components/Settings/SettingsPanelEmbeddings.razor
index 7203ff78..1e200175 100644
--- a/app/MindWork AI Studio/Components/Settings/SettingsPanelEmbeddings.razor	
+++ b/app/MindWork AI Studio/Components/Settings/SettingsPanelEmbeddings.razor	
@@ -41,7 +41,7 @@
             <RowTemplate>
                 <MudTd>@context.Num</MudTd>
                 <MudTd>@context.Name</MudTd>
-                <MudTd>@context.UsedLLMProvider</MudTd>
+                <MudTd>@context.UsedLLMProvider.ToName()</MudTd>
                 <MudTd>@this.GetEmbeddingProviderModelName(context)</MudTd>
                 
                 <MudTd>
diff --git a/app/MindWork AI Studio/Dialogs/EmbeddingProviderDialog.razor b/app/MindWork AI Studio/Dialogs/EmbeddingProviderDialog.razor
index 5305e433..2aea5f63 100644
--- a/app/MindWork AI Studio/Dialogs/EmbeddingProviderDialog.razor	
+++ b/app/MindWork AI Studio/Dialogs/EmbeddingProviderDialog.razor	
@@ -11,49 +11,58 @@
                     {
                         if (provider.ProvideEmbeddings())
                         {
-                            <MudSelectItem Value="@provider">@provider</MudSelectItem>
+                            <MudSelectItem Value="@provider">
+                                @provider.ToName()
+                            </MudSelectItem>
                         }
                     }
                 </MudSelect>
                 <MudButton Disabled="@(!this.DataLLMProvider.ShowRegisterButton())" Variant="Variant.Filled" Size="Size.Small" StartIcon="@Icons.Material.Filled.OpenInBrowser" Href="@this.DataLLMProvider.GetCreationURL()" Target="_blank">Create account</MudButton>
             </MudStack>
             
-            @* ReSharper disable once CSharpWarnings::CS8974 *@
-            <MudTextField
-                T="string"
-                @bind-Text="@this.dataAPIKey"
-                Label="@this.APIKeyText"
-                Disabled="@(!this.DataLLMProvider.IsAPIKeyNeeded(this.DataHost))"
-                Class="mb-3"
-                Adornment="Adornment.Start"
-                AdornmentIcon="@Icons.Material.Filled.VpnKey"
-                AdornmentColor="Color.Info"
-                InputType="InputType.Password"
-                Validation="@this.providerValidation.ValidatingAPIKey"
-            />
-            
-            <MudTextField
-                T="string"
-                @bind-Text="@this.DataHostname"
-                Label="Hostname"
-                Disabled="@(!this.DataLLMProvider.IsHostnameNeeded())"
-                Class="mb-3"
-                Adornment="Adornment.Start"
-                AdornmentIcon="@Icons.Material.Filled.Dns"
-                AdornmentColor="Color.Info"
-                Validation="@this.providerValidation.ValidatingHostname"
-                UserAttributes="@SPELLCHECK_ATTRIBUTES"
-            />
+            @if (this.DataLLMProvider.IsAPIKeyNeeded(this.DataHost))
+            {
+                @* ReSharper disable once CSharpWarnings::CS8974 *@
+                <MudTextField
+                    T="string"
+                    @bind-Text="@this.dataAPIKey"
+                    Label="@this.APIKeyText"
+                    Class="mb-3"
+                    Adornment="Adornment.Start"
+                    AdornmentIcon="@Icons.Material.Filled.VpnKey"
+                    AdornmentColor="Color.Info"
+                    InputType="InputType.Password"
+                    Validation="@this.providerValidation.ValidatingAPIKey"/>
+            }
 
-            <MudSelect Disabled="@(!this.DataLLMProvider.IsHostNeeded())" @bind-Value="@this.DataHost" Label="Host" Class="mb-3" OpenIcon="@Icons.Material.Filled.ExpandMore" AdornmentColor="Color.Info" Adornment="Adornment.Start" Validation="@this.providerValidation.ValidatingHost">
-                @foreach (Host host in Enum.GetValues(typeof(Host)))
-                {
-                    if (host.AreEmbeddingsSupported())
+            @if (this.DataLLMProvider.IsHostnameNeeded())
+            {
+                <MudTextField
+                    T="string"
+                    @bind-Text="@this.DataHostname"
+                    Label="Hostname"
+                    Class="mb-3"
+                    Adornment="Adornment.Start"
+                    AdornmentIcon="@Icons.Material.Filled.Dns"
+                    AdornmentColor="Color.Info"
+                    Validation="@this.providerValidation.ValidatingHostname"
+                    UserAttributes="@SPELLCHECK_ATTRIBUTES"/>
+            }
+
+            @if (this.DataLLMProvider.IsHostNeeded())
+            {
+                <MudSelect @bind-Value="@this.DataHost" Label="Host" Class="mb-3" OpenIcon="@Icons.Material.Filled.ExpandMore" AdornmentColor="Color.Info" Adornment="Adornment.Start" Validation="@this.providerValidation.ValidatingHost">
+                    @foreach (Host host in Enum.GetValues(typeof(Host)))
                     {
-                        <MudSelectItem Value="@host">@host.Name()</MudSelectItem>
+                        if (host.AreEmbeddingsSupported())
+                        {
+                            <MudSelectItem Value="@host">
+                                @host.Name()
+                            </MudSelectItem>
+                        }
                     }
-                }
-            </MudSelect>
+                </MudSelect>
+            }
 
             <MudStack Row="@true" AlignItems="AlignItems.Center">
                 @if (this.DataLLMProvider.IsEmbeddingModelProvidedManually(this.DataHost))
diff --git a/app/MindWork AI Studio/Dialogs/ProviderDialog.razor b/app/MindWork AI Studio/Dialogs/ProviderDialog.razor
index 5998f12f..1a01faba 100644
--- a/app/MindWork AI Studio/Dialogs/ProviderDialog.razor	
+++ b/app/MindWork AI Studio/Dialogs/ProviderDialog.razor	
@@ -10,25 +10,28 @@
                 <MudSelect @bind-Value="@this.DataLLMProvider" Label="Provider" Class="mb-3" OpenIcon="@Icons.Material.Filled.AccountBalance" AdornmentColor="Color.Info" Adornment="Adornment.Start" Validation="@this.providerValidation.ValidatingProvider">
                     @foreach (LLMProviders provider in Enum.GetValues(typeof(LLMProviders)))
                     {
-                        <MudSelectItem Value="@provider">@provider.ToName()</MudSelectItem>
+                        <MudSelectItem Value="@provider">
+                            @provider.ToName()
+                        </MudSelectItem>
                     }
                 </MudSelect>
                 <MudButton Disabled="@(!this.DataLLMProvider.ShowRegisterButton())" Variant="Variant.Filled" Size="Size.Small" StartIcon="@Icons.Material.Filled.OpenInBrowser" Href="@this.DataLLMProvider.GetCreationURL()" Target="_blank">Create account</MudButton>
             </MudStack>
             
-            @* ReSharper disable once CSharpWarnings::CS8974 *@
-            <MudTextField
-                T="string"
-                @bind-Text="@this.dataAPIKey"
-                Label="@this.APIKeyText"
-                Disabled="@(!this.DataLLMProvider.IsAPIKeyNeeded(this.DataHost))"
-                Class="mb-3"
-                Adornment="Adornment.Start"
-                AdornmentIcon="@Icons.Material.Filled.VpnKey"
-                AdornmentColor="Color.Info"
-                InputType="InputType.Password"
-                Validation="@this.providerValidation.ValidatingAPIKey"
-            />
+            @if (this.DataLLMProvider.IsAPIKeyNeeded(this.DataHost))
+            {
+                @* ReSharper disable once CSharpWarnings::CS8974 *@
+                <MudTextField
+                    T="string"
+                    @bind-Text="@this.dataAPIKey"
+                    Label="@this.APIKeyText"
+                    Class="mb-3"
+                    Adornment="Adornment.Start"
+                    AdornmentIcon="@Icons.Material.Filled.VpnKey"
+                    AdornmentColor="Color.Info"
+                    InputType="InputType.Password"
+                    Validation="@this.providerValidation.ValidatingAPIKey"/>
+            }
 
             @if (this.DataLLMProvider.IsHostnameNeeded())
             {
@@ -36,7 +39,6 @@
                     T="string"
                     @bind-Text="@this.DataHostname"
                     Label="Hostname"
-                    Disabled="@(!this.DataLLMProvider.IsHostnameNeeded())"
                     Class="mb-3"
                     Adornment="Adornment.Start"
                     AdornmentIcon="@Icons.Material.Filled.Dns"
@@ -47,10 +49,12 @@
 
             @if (this.DataLLMProvider.IsHostNeeded())
             {
-                <MudSelect Disabled="@(!this.DataLLMProvider.IsHostNeeded())" @bind-Value="@this.DataHost" Label="Host" Class="mb-3" OpenIcon="@Icons.Material.Filled.ExpandMore" AdornmentColor="Color.Info" Adornment="Adornment.Start" Validation="@this.providerValidation.ValidatingHost">
+                <MudSelect @bind-Value="@this.DataHost" Label="Host" Class="mb-3" OpenIcon="@Icons.Material.Filled.ExpandMore" AdornmentColor="Color.Info" Adornment="Adornment.Start" Validation="@this.providerValidation.ValidatingHost">
                     @foreach (Host host in Enum.GetValues(typeof(Host)))
                     {
-                        <MudSelectItem Value="@host">@host.Name()</MudSelectItem>
+                        <MudSelectItem Value="@host">
+                            @host.Name()
+                        </MudSelectItem>
                     }
                 </MudSelect>
             }
diff --git a/app/MindWork AI Studio/wwwroot/changelog/v0.9.40.md b/app/MindWork AI Studio/wwwroot/changelog/v0.9.40.md
index 7e7d7b4c..f7edfe98 100644
--- a/app/MindWork AI Studio/wwwroot/changelog/v0.9.40.md	
+++ b/app/MindWork AI Studio/wwwroot/changelog/v0.9.40.md	
@@ -2,6 +2,7 @@
 - Added support for the announced OpenAI `o4` models.
 - Added Alibaba Cloud as a new provider. Thanks Peer `peerschuett` for the contribution.
 - Added the Hugging Face inference provider as an LLM provider to AI Studio. Thanks Peer `peerschuett` for the contribution.
+- Improved the LLM & embedding provider dialogs by hiding not relevant options.
 - Improved the provider selection by showing the name of the provider in the provider selection instead of its identifier.
 - Improved the developer experience by adding a tolerant enum converter for better configuration handling.
 - Fixed an issue where OpenAI `o3` models were not shown in the model selection.