diff --git a/app/MindWork AI Studio/Assistants/EDI/AssistantEDI.razor.cs b/app/MindWork AI Studio/Assistants/EDI/AssistantEDI.razor.cs
index e4462a51..3974223d 100644
--- a/app/MindWork AI Studio/Assistants/EDI/AssistantEDI.razor.cs	
+++ b/app/MindWork AI Studio/Assistants/EDI/AssistantEDI.razor.cs	
@@ -26,7 +26,7 @@ public partial class AssistantEDI : AssistantBaseCore
     
     protected override string SubmitText => "Create the EDI server";
 
-    protected override Func<Task> SubmitAction => () => Task.CompletedTask;
+    protected override Func<Task> SubmitAction => this.GenerateServer;
     
     protected override ChatThread ConvertToChatThread => (this.chatThread ?? new()) with
     {
@@ -124,4 +124,11 @@ public partial class AssistantEDI : AssistantBaseCore
         
         return $"You have selected {selectedValues.Count} authentication methods";
     }
+
+    private async Task GenerateServer()
+    {
+        await this.form!.Validate();
+        if (!this.inputIsValid)
+            return;
+    }
 }
\ No newline at end of file