diff --git a/app/MindWork AI Studio/Components/Pages/Coding/AssistantCoding.razor.cs b/app/MindWork AI Studio/Components/Pages/Coding/AssistantCoding.razor.cs
index 1635c4f8..2f4e7206 100644
--- a/app/MindWork AI Studio/Components/Pages/Coding/AssistantCoding.razor.cs	
+++ b/app/MindWork AI Studio/Components/Pages/Coding/AssistantCoding.razor.cs	
@@ -101,9 +101,13 @@ public partial class AssistantCoding : AssistantBaseCore
             foreach (var codingContext in this.codingContexts)
             {
                 sbContext.AppendLine($"ID: {codingContext.Id}");
-                sbContext.AppendLine($"Language: {codingContext.Language.Name()}");
-                sbContext.AppendLine($"Other Language: {codingContext.OtherLanguage}");
-                sbContext.AppendLine($"Content:");
+                
+                if(codingContext.Language is not CommonCodingLanguages.OTHER)
+                    sbContext.AppendLine($"Language: {codingContext.Language.Name()}");
+                else
+                    sbContext.AppendLine($"Language: {codingContext.OtherLanguage}");
+                
+                sbContext.AppendLine("Content:");
                 sbContext.AppendLine("```");
                 sbContext.AppendLine(codingContext.Code);
                 sbContext.AppendLine("```");
diff --git a/app/MindWork AI Studio/wwwroot/changelog/v0.8.10.md b/app/MindWork AI Studio/wwwroot/changelog/v0.8.10.md
new file mode 100644
index 00000000..d515c6fc
--- /dev/null
+++ b/app/MindWork AI Studio/wwwroot/changelog/v0.8.10.md	
@@ -0,0 +1,2 @@
+# v0.8.10, build 172
+- Improved the coding assistant's language handling when creating the corresponding prompt
\ No newline at end of file