diff --git a/app/MindWork AI Studio/Assistants/Builder/AssistantBuilder.razor b/app/MindWork AI Studio/Assistants/Builder/AssistantBuilder.razor
index c2951401..e7dee796 100644
--- a/app/MindWork AI Studio/Assistants/Builder/AssistantBuilder.razor	
+++ b/app/MindWork AI Studio/Assistants/Builder/AssistantBuilder.razor	
@@ -1,7 +1,7 @@
 @attribute [Route(Routes.ASSISTANT_META_ASSISTANT)]
 @using AIStudio.Agents.AssistantAudit
 @using AIStudio.Tools.PluginSystem.Assistants.DataModel
-@inherits AssistantBaseCore<AIStudio.Dialogs.Settings.NoSettingsPanel>
+@inherits AssistantBaseCore<AIStudio.Dialogs.Settings.SettingsDialogAssistantBuilder>
 
 <PreviewBeta ApplyInnerScrollingFix="true"/>
 
diff --git a/app/MindWork AI Studio/Assistants/Builder/AssistantBuilder.razor.cs b/app/MindWork AI Studio/Assistants/Builder/AssistantBuilder.razor.cs
index 42482f07..3646d3f9 100644
--- a/app/MindWork AI Studio/Assistants/Builder/AssistantBuilder.razor.cs	
+++ b/app/MindWork AI Studio/Assistants/Builder/AssistantBuilder.razor.cs	
@@ -11,7 +11,7 @@ using DialogOptions = AIStudio.Dialogs.DialogOptions;
 
 namespace AIStudio.Assistants.Builder;
 
-public partial class AssistantBuilder : AssistantBaseCore<NoSettingsPanel>
+public partial class AssistantBuilder : AssistantBaseCore<SettingsDialogAssistantBuilder>
 {
     [Inject]
     private IDialogService DialogService { get; init; } = null!;
@@ -64,7 +64,6 @@ public partial class AssistantBuilder : AssistantBaseCore<NoSettingsPanel>
     protected override bool ShowProfileSelection => false;
     protected override bool ShowCopyResult => this.step is BuilderStep.DONE;
 
-    protected override bool HasSettingsPanel => false;
     protected override Func<string> Result2Copy => () => !string.IsNullOrWhiteSpace(this.generatedLuaAssistant)
         ? this.generatedLuaAssistant
         : this.generatedAssistantSpec;
@@ -209,9 +208,7 @@ public partial class AssistantBuilder : AssistantBaseCore<NoSettingsPanel>
         this.typicalInput = string.Empty;
         this.expectedOutput = string.Empty;
         this.selectedAssistantComponents = [];
-        this.selectedOutputLanguage = CommonLanguages.AS_IS;
-        this.customOutputLanguage = string.Empty;
-        this.allowGeneratedAssistantProfiles = true;
+        this.ApplyDefaultBuilderOptions();
         this.extraRules = string.Empty;
         this.exampleRequest = string.Empty;
         this.generatedAssistantSpec = string.Empty;
@@ -220,7 +217,27 @@ public partial class AssistantBuilder : AssistantBaseCore<NoSettingsPanel>
         this.ResetInstallFlow();
     }
 
-    protected override bool MightPreselectValues() => false;
+    protected override bool MightPreselectValues()
+    {
+        this.ApplyDefaultBuilderOptions();
+        return true;
+    }
+
+    private void ApplyDefaultBuilderOptions()
+    {
+        var defaults = this.SettingsManager.ConfigurationData.AssistantBuilder;
+        if (!defaults.PreselectOptions)
+        {
+            this.selectedOutputLanguage = CommonLanguages.AS_IS;
+            this.customOutputLanguage = string.Empty;
+            this.allowGeneratedAssistantProfiles = true;
+            return;
+        }
+
+        this.selectedOutputLanguage = defaults.PreselectedOutputLanguage;
+        this.customOutputLanguage = defaults.PreselectedOtherOutputLanguage;
+        this.allowGeneratedAssistantProfiles = true;
+    }
 
     /// <inheritdoc />
     protected override void CaptureCustomAssistantSessionState(AssistantSessionStateWriter state)