diff --git a/app/MindWork AI Studio/Assistants/AssistantBase.razor b/app/MindWork AI Studio/Assistants/AssistantBase.razor
index 4760b622..53d6b642 100644
--- a/app/MindWork AI Studio/Assistants/AssistantBase.razor	
+++ b/app/MindWork AI Studio/Assistants/AssistantBase.razor	
@@ -38,7 +38,7 @@
                     </CascadingValue>
                     
                     <MudStack Row="true" AlignItems="AlignItems.Center" StretchItems="StretchItems.Start" Class="mb-3">
-                        <MudButton Disabled="@this.SubmitDisabled" Variant="Variant.Filled" OnClick="@(async () => await this.Start())" Style="@this.SubmitButtonStyle">
+                        <MudButton Disabled="@(this.SubmitDisabled || this.isProcessing)" Variant="Variant.Filled" OnClick="@(async () => await this.Start())" Style="@this.SubmitButtonStyle">
                             @this.SubmitText
                         </MudButton>
                         @if (this.isProcessing && this.cancellationTokenSource is not null)
diff --git a/app/MindWork AI Studio/Assistants/PromptOptimizer/AssistantPromptOptimizer.razor b/app/MindWork AI Studio/Assistants/PromptOptimizer/AssistantPromptOptimizer.razor
index f8e7ed23..8c00031e 100644
--- a/app/MindWork AI Studio/Assistants/PromptOptimizer/AssistantPromptOptimizer.razor	
+++ b/app/MindWork AI Studio/Assistants/PromptOptimizer/AssistantPromptOptimizer.razor	
@@ -39,17 +39,20 @@
 
 <MudStack Row="true" AlignItems="AlignItems.Center" Class="mb-2">
     <MudText Typo="Typo.h6">@T("Prompt Recommendations")</MudText>
-    @if (this.ShowUpdatedPromptGuidelinesIndicator)
-    {
-        <MudTooltip Text="@T("Prompt recommendations updated from your latest optimization.")">
-            <MudIcon Icon="@Icons.Material.Filled.AutoFixHigh" Color="Color.Info" Size="Size.Medium" Class="ml-2"/>
-        </MudTooltip>
-    }
 </MudStack>
 
+@if (this.ShowUpdatedPromptGuidelinesIndicator)
+{
+    <MudAlert Severity="Severity.Info" Dense="true" Variant="Variant.Outlined" Class="mb-3">
+        <MudStack Row="true" AlignItems="AlignItems.Center" Wrap="Wrap.Wrap">
+            <MudText Typo="Typo.body2">@T("Prompt recommendations were updated based on your latest optimization.")</MudText>
+        </MudStack>
+    </MudAlert>
+}
+
 @if (!this.useCustomPromptGuide)
 {
-    <MudJustifiedText Class="mb-3">@T("Use these recommendations, that are based on our own prompt guide, to improve the clarity, directness, and relevance of your prompts. The suggestions are updated based on your latest prompt optimization.")</MudJustifiedText>
+    <MudJustifiedText Class="mb-3">@T("Use these recommendations, that are based on the default prompt guide, to improve the clarity, directness, and relevance of your prompts. The suggestions are updated based on your latest prompt optimization.")</MudJustifiedText>
 
     <MudGrid Class="mb-3">
         <MudItem xs="12" sm="6" md="4">
@@ -71,6 +74,11 @@
             <MudTextField T="string" Value="@this.recLanguageChoice" Label="@T("Choose prompt language deliberately")" ReadOnly="true" Variant="Variant.Outlined" Lines="2" AutoGrow="@true" />
         </MudItem>
     </MudGrid>
+} 
+
+@if (this.useCustomPromptGuide)
+{
+<MudJustifiedText Class="mb-3">@T("Use the prompt recommendations from the custom prompt guide that was provided by the user.")</MudJustifiedText>
 }
 
 <MudStack Row="true" AlignItems="AlignItems.Center" Wrap="Wrap.Wrap" StretchItems="StretchItems.None" Class="mb-3">
diff --git a/app/MindWork AI Studio/Assistants/PromptOptimizer/AssistantPromptOptimizer.razor.cs b/app/MindWork AI Studio/Assistants/PromptOptimizer/AssistantPromptOptimizer.razor.cs
index a9f9c092..b863d42f 100644
--- a/app/MindWork AI Studio/Assistants/PromptOptimizer/AssistantPromptOptimizer.razor.cs	
+++ b/app/MindWork AI Studio/Assistants/PromptOptimizer/AssistantPromptOptimizer.razor.cs	
@@ -62,6 +62,8 @@ public partial class AssistantPromptOptimizer : AssistantBaseCore<SettingsDialog
 
     protected override Func<Task> SubmitAction => this.OptimizePromptAsync;
 
+    protected override bool SubmitDisabled => this.useCustomPromptGuide && this.customPromptGuideFiles.Count == 0;
+
     protected override ChatThread ConvertToChatThread => (this.chatThread ?? new()) with
     {
         SystemPrompt = SystemPrompts.DEFAULT,
@@ -197,7 +199,7 @@ public partial class AssistantPromptOptimizer : AssistantBaseCore<SettingsDialog
             if (!this.useCustomPromptGuide)
             {
                 this.ApplyFallbackRecommendations();
-                this.hasUpdatedDefaultRecommendations = true;
+                this.MarkRecommendationsUpdated();
             }
 
             this.AddInputIssue(T("The model response was not in the expected JSON format. The raw response is shown as optimized prompt."));
@@ -319,6 +321,11 @@ public partial class AssistantPromptOptimizer : AssistantBaseCore<SettingsDialog
             return;
 
         this.ApplyRecommendations(optimizationResult.Recommendations);
+        this.MarkRecommendationsUpdated();
+    }
+
+    private void MarkRecommendationsUpdated()
+    {
         this.hasUpdatedDefaultRecommendations = true;
     }