diff --git a/scripts/Windows/Software/Windows/Manage.ps1 b/scripts/Windows/Software/Windows/Manage.ps1
index 79a38a2a..4e9ab995 100644
--- a/scripts/Windows/Software/Windows/Manage.ps1
+++ b/scripts/Windows/Software/Windows/Manage.ps1
@@ -31,6 +31,10 @@ Start-SoftwareInstaller @PSBoundParameters `
             Get-Config "valhalla.windows.$Name";
         }
 
+        # Copy keyboard layout
+        # ToDo: Why not NewUser? Investiagte!
+        Copy-UserInternationalSettingsToSystem -WelcomeScreen $True -NewUser $False;
+
         if (Get-WinConfig "legacyIconSpacing") {
             Write-Host "Setting up old-school Desktop Icon spacing";