diff --git a/app/MindWork AI Studio/Assistants/I18N/AssistantI18N.razor b/app/MindWork AI Studio/Assistants/I18N/AssistantI18N.razor
index bd39da42..5d359dc8 100644
--- a/app/MindWork AI Studio/Assistants/I18N/AssistantI18N.razor	
+++ b/app/MindWork AI Studio/Assistants/I18N/AssistantI18N.razor	
@@ -2,6 +2,7 @@
 @using AIStudio.Settings
 @inherits AssistantBaseCore<AIStudio.Dialogs.Settings.SettingsDialogI18N>
 
+<EnumSelection T="CommonLanguages" NameFunc="@(language => language.NameSelecting())" @bind-Value="@this.selectedTargetLanguage" ValidateSelection="@this.ValidatingTargetLanguage" Icon="@Icons.Material.Filled.Translate" Label="Target language" AllowOther="@true" OtherValue="CommonLanguages.OTHER" @bind-OtherInput="@this.customTargetLanguage" ValidateOther="@this.ValidateCustomLanguage" LabelOther="Custom target language" SelectionUpdated="_ => this.OnChangedLanguage()" />
 <ConfigurationSelect OptionDescription="Language plugin used for comparision" SelectedValue="@(() => this.selectedLanguagePluginId)" Data="@ConfigurationSelectDataFactory.GetLanguagesData()" SelectionUpdate="@(async void (id) => await this.OnLanguagePluginChanged(id))" OptionHelp="Select the language plugin used for comparision."/>
 @if (this.isLoading)
 {
@@ -76,6 +77,14 @@ else if (!this.isLoading && string.IsNullOrWhiteSpace(this.loadingIssue))
         </PagerContent>
     </MudTable>
     
-    <EnumSelection T="CommonLanguages" NameFunc="@(language => language.NameSelecting())" @bind-Value="@this.selectedTargetLanguage" ValidateSelection="@this.ValidatingTargetLanguage" Icon="@Icons.Material.Filled.Translate" Label="Target language" AllowOther="@true" OtherValue="CommonLanguages.OTHER" @bind-OtherInput="@this.customTargetLanguage" ValidateOther="@this.ValidateCustomLanguage" LabelOther="Custom target language" />
-    <ProviderSelection @bind-ProviderSettings="@this.providerSettings" ValidateProvider="@this.ValidatingProvider"/>
+    @if (this.selectedTargetLanguage is CommonLanguages.EN_US)
+    {
+        <MudJustifiedText Typo="Typo.body1" Class="mb-6">
+            Please note: neither is a translation needed nor performed for the English (USA). Anyway, you might want to generate the related Lua code.
+        </MudJustifiedText>
+    }
+    else
+    {
+        <ProviderSelection @bind-ProviderSettings="@this.providerSettings" ValidateProvider="@this.ValidatingProvider"/>
+    }
 }
\ No newline at end of file
diff --git a/app/MindWork AI Studio/Assistants/I18N/AssistantI18N.razor.cs b/app/MindWork AI Studio/Assistants/I18N/AssistantI18N.razor.cs
index 2bb5bcf8..62fe512d 100644
--- a/app/MindWork AI Studio/Assistants/I18N/AssistantI18N.razor.cs	
+++ b/app/MindWork AI Studio/Assistants/I18N/AssistantI18N.razor.cs	
@@ -22,10 +22,12 @@ public partial class AssistantI18N : AssistantBaseCore<SettingsDialogI18N>
         """;
     
     protected override bool AllowProfiles => false;
+
+    protected override bool ShowResult => false;
     
     protected override IReadOnlyList<IButtonData> FooterButtons => [];
     
-    protected override string SubmitText => "Localize AI Studio";
+    protected override string SubmitText => "Localize AI Studio & generate the Lua code";
     
     protected override Func<Task> SubmitAction => this.LocalizeText;
 
@@ -39,6 +41,8 @@ public partial class AssistantI18N : AssistantBaseCore<SettingsDialogI18N>
             this.selectedTargetLanguage = CommonLanguages.AS_IS;
             this.customTargetLanguage = string.Empty;
         }
+
+        _ = this.OnChangedLanguage();
     }
     
     protected override bool MightPreselectValues()
@@ -61,6 +65,8 @@ public partial class AssistantI18N : AssistantBaseCore<SettingsDialogI18N>
     private bool localizationPossible;
     private string searchString = string.Empty;
     private Guid selectedLanguagePluginId;
+    private ILanguagePlugin? selectedLanguagePlugin;
+    private bool isTranslationNeeded;
     private Dictionary<string, string> addedKeys = [];
     private Dictionary<string, string> removedKeys = [];
 
@@ -69,20 +75,45 @@ public partial class AssistantI18N : AssistantBaseCore<SettingsDialogI18N>
     protected override async Task OnInitializedAsync()
     {
         await base.OnInitializedAsync();
+        await this.OnLanguagePluginChanged(this.selectedLanguagePluginId);
         await this.LoadData();
     }
 
     #endregion
-
+    
     private async Task OnLanguagePluginChanged(Guid pluginId)
     {
         this.selectedLanguagePluginId = pluginId;
-        await this.LoadData();
+        await this.OnChangedLanguage();
+    }
+
+    private async Task OnChangedLanguage()
+    {
+        if (PluginFactory.RunningPlugins.FirstOrDefault(n => n is PluginLanguage && n.Id == this.selectedLanguagePluginId) is not PluginLanguage comparisonPlugin)
+            this.loadingIssue = $"Was not able to load the language plugin for comparison ({this.selectedLanguagePluginId}). Please select a valid, loaded & running language plugin.";
+        else if (comparisonPlugin.IETFTag != this.selectedTargetLanguage.ToIETFTag())
+            this.loadingIssue = $"The selected language plugin for comparison uses the IETF tag '{comparisonPlugin.IETFTag}' which does not match the selected target language '{this.selectedTargetLanguage.ToIETFTag()}'. Please select a valid, loaded & running language plugin which matches the target language.";
+        else
+        {
+            this.selectedLanguagePlugin = comparisonPlugin;
+            this.loadingIssue = string.Empty;
+            await this.LoadData();
+        }
+        
         this.StateHasChanged();
     }
     
     private async Task LoadData()
     {
+        if (this.selectedLanguagePlugin is null)
+        {
+            this.loadingIssue = "Please select a language plugin for comparison.";
+            this.localizationPossible = false;
+            this.isLoading = false;
+            this.StateHasChanged();
+            return;
+        }
+        
         this.isLoading = true;
         this.StateHasChanged();
         
@@ -124,17 +155,12 @@ public partial class AssistantI18N : AssistantBaseCore<SettingsDialogI18N>
             case PluginLanguage pluginLanguage:
                 this.loadingIssue = string.Empty;
                 var newI18NContent = pluginLanguage.Content;
-
-                if(PluginFactory.RunningPlugins.FirstOrDefault(n => n is PluginLanguage && n.Id == this.selectedLanguagePluginId) is not PluginLanguage comparisonPlugin)
-                {
-                    this.loadingIssue = $"Was not able to load the language plugin for comparison ({this.selectedLanguagePluginId}). Please select a valid, loaded & running language plugin.";
-                    break;
-                }
                 
-                var currentI18NContent = comparisonPlugin.Content;
+                var currentI18NContent = this.selectedLanguagePlugin.Content;
                 this.addedKeys = newI18NContent.ExceptBy(currentI18NContent.Keys, n => n.Key).ToDictionary();
                 this.removedKeys = currentI18NContent.ExceptBy(newI18NContent.Keys, n => n.Key).ToDictionary();
                 this.localizationPossible = true;
+                this.isTranslationNeeded = this.selectedTargetLanguage is not CommonLanguages.EN_US;
                 break;
         }