From 6cdec70915d0780dbe67a1232aaece1bfe8ecd37 Mon Sep 17 00:00:00 2001
From: Tyrix <578264+Tyrix@users.noreply.github.com>
Date: Fri, 27 Mar 2026 11:53:27 +0100
Subject: [PATCH 1/3] Feature (RDP): Active Directory computer import (OU
 subtree, flat hierarchy)

---
 .../Resources/Strings.Designer.cs             | 110 +++++++-
 .../Resources/Strings.resx                    |  38 ++-
 .../ActiveDirectoryComputerRecord.cs          |   8 +
 .../ActiveDirectoryComputerSearcher.cs        | 103 ++++++++
 .../GroupNameValidator.cs                     |   5 +-
 Source/NETworkManager/ProfileDialogManager.cs |  28 ++-
 .../ViewModels/ImportAdComputersViewModel.cs  | 237 ++++++++++++++++++
 .../ViewModels/RemoteDesktopHostViewModel.cs  |  15 ++
 .../Views/ImportAdComputersChildWindow.xaml   | 113 +++++++++
 .../ImportAdComputersChildWindow.xaml.cs      |  29 +++
 .../Views/RemoteDesktopHostView.xaml          |  27 +-
 11 files changed, 708 insertions(+), 5 deletions(-)
 create mode 100644 Source/NETworkManager.Utilities/ActiveDirectory/ActiveDirectoryComputerRecord.cs
 create mode 100644 Source/NETworkManager.Utilities/ActiveDirectory/ActiveDirectoryComputerSearcher.cs
 create mode 100644 Source/NETworkManager/ViewModels/ImportAdComputersViewModel.cs
 create mode 100644 Source/NETworkManager/Views/ImportAdComputersChildWindow.xaml
 create mode 100644 Source/NETworkManager/Views/ImportAdComputersChildWindow.xaml.cs

diff --git a/Source/NETworkManager.Localization/Resources/Strings.Designer.cs b/Source/NETworkManager.Localization/Resources/Strings.Designer.cs
index afaa7510d8..7354485a37 100644
--- a/Source/NETworkManager.Localization/Resources/Strings.Designer.cs
+++ b/Source/NETworkManager.Localization/Resources/Strings.Designer.cs
@@ -1,4 +1,4 @@
-//------------------------------------------------------------------------------
+//------------------------------------------------------------------------------
 // <auto-generated>
 //     Dieser Code wurde von einem Tool generiert.
 //     Laufzeitversion:4.0.30319.42000
@@ -294,6 +294,69 @@ public static string Accent_Yellow {
             }
         }
         
+        /// <summary>
+        ///   Sucht eine lokalisierte Zeichenfolge, die Active Directory import failed. ähnelt.
+        /// </summary>
+        public static string ActiveDirectoryImportFailed {
+            get {
+                return ResourceManager.GetString("ActiveDirectoryImportFailed", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Zeichenfolge, die Options ähnelt.
+        /// </summary>
+        public static string ActiveDirectoryImportOptions {
+            get {
+                return ResourceManager.GetString("ActiveDirectoryImportOptions", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Zeichenfolge, die Load or unlock a profile file before importing computers. ähnelt.
+        /// </summary>
+        public static string ActiveDirectoryImportRequiresProfileFile {
+            get {
+                return ResourceManager.GetString("ActiveDirectoryImportRequiresProfileFile", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Zeichenfolge, die Imported {0} computer profile(s). Skipped {1} duplicate name(s) in the target group. Skipped {2} without a DNS host name. ähnelt.
+        /// </summary>
+        public static string ActiveDirectoryImportSummary {
+            get {
+                return ResourceManager.GetString("ActiveDirectoryImportSummary", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Zeichenfolge, die Uses your current Windows credentials to read from Active Directory. The account must be allowed to enumerate computer objects under the search base (subtree). ähnelt.
+        /// </summary>
+        public static string ActiveDirectoryImportUsesCurrentCredentials {
+            get {
+                return ResourceManager.GetString("ActiveDirectoryImportUsesCurrentCredentials", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Zeichenfolge, die Search base (OU DN) ähnelt.
+        /// </summary>
+        public static string ActiveDirectorySearchBase {
+            get {
+                return ResourceManager.GetString("ActiveDirectorySearchBase", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Zeichenfolge, die OU=Computers,DC=example,DC=com ähnelt.
+        /// </summary>
+        public static string ActiveDirectorySearchBaseWatermark {
+            get {
+                return ResourceManager.GetString("ActiveDirectorySearchBaseWatermark", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Sucht eine lokalisierte Zeichenfolge, die Add ähnelt.
         /// </summary>
@@ -3895,6 +3958,15 @@ public static string ExampleTag {
             }
         }
         
+        /// <summary>
+        ///   Sucht eine lokalisierte Zeichenfolge, die Exclude disabled computer accounts ähnelt.
+        /// </summary>
+        public static string ExcludeDisabledComputerAccounts {
+            get {
+                return ResourceManager.GetString("ExcludeDisabledComputerAccounts", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Sucht eine lokalisierte Zeichenfolge, die Execution Policy ähnelt.
         /// </summary>
@@ -4886,6 +4958,24 @@ public static string Import {
             }
         }
         
+        /// <summary>
+        ///   Sucht eine lokalisierte Zeichenfolge, die Import computers from Active Directory ähnelt.
+        /// </summary>
+        public static string ImportComputersFromActiveDirectory {
+            get {
+                return ResourceManager.GetString("ImportComputersFromActiveDirectory", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Zeichenfolge, die Import computers from Active Directory... ähnelt.
+        /// </summary>
+        public static string ImportComputersFromActiveDirectoryDots {
+            get {
+                return ResourceManager.GetString("ImportComputersFromActiveDirectoryDots", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Sucht eine lokalisierte Zeichenfolge, die Import / Export ähnelt.
         /// </summary>
@@ -10161,6 +10251,24 @@ public static string Tags {
             }
         }
         
+        /// <summary>
+        ///   Sucht eine lokalisierte Zeichenfolge, die Target profile group ähnelt.
+        /// </summary>
+        public static string TargetProfileGroup {
+            get {
+                return ResourceManager.GetString("TargetProfileGroup", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Zeichenfolge, die Existing or new group name ähnelt.
+        /// </summary>
+        public static string TargetProfileGroupWatermark {
+            get {
+                return ResourceManager.GetString("TargetProfileGroupWatermark", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Sucht eine lokalisierte Zeichenfolge, die Taupe ähnelt.
         /// </summary>
diff --git a/Source/NETworkManager.Localization/Resources/Strings.resx b/Source/NETworkManager.Localization/Resources/Strings.resx
index 80c5d2473c..16debae4bb 100644
--- a/Source/NETworkManager.Localization/Resources/Strings.resx
+++ b/Source/NETworkManager.Localization/Resources/Strings.resx
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -4010,4 +4010,40 @@ You can copy your profile files from “{0}” to “{1}” to migrate your exis
   <data name="ToolTip_Reload" xml:space="preserve">
     <value>Reload</value>
   </data>
+  <data name="ActiveDirectoryImportFailed" xml:space="preserve">
+    <value>Active Directory import failed.</value>
+  </data>
+  <data name="ActiveDirectoryImportOptions" xml:space="preserve">
+    <value>Options</value>
+  </data>
+  <data name="ActiveDirectoryImportRequiresProfileFile" xml:space="preserve">
+    <value>Load or unlock a profile file before importing computers.</value>
+  </data>
+  <data name="ActiveDirectoryImportSummary" xml:space="preserve">
+    <value>Imported {0} computer profile(s). Skipped {1} duplicate name(s) in the target group. Skipped {2} without a DNS host name.</value>
+  </data>
+  <data name="ActiveDirectoryImportUsesCurrentCredentials" xml:space="preserve">
+    <value>Uses your current Windows credentials to read from Active Directory. The account must be allowed to enumerate computer objects under the search base (subtree).</value>
+  </data>
+  <data name="ActiveDirectorySearchBase" xml:space="preserve">
+    <value>Search base (OU DN)</value>
+  </data>
+  <data name="ActiveDirectorySearchBaseWatermark" xml:space="preserve">
+    <value>OU=Computers,DC=example,DC=com</value>
+  </data>
+  <data name="ExcludeDisabledComputerAccounts" xml:space="preserve">
+    <value>Exclude disabled computer accounts</value>
+  </data>
+  <data name="ImportComputersFromActiveDirectory" xml:space="preserve">
+    <value>Import computers from Active Directory</value>
+  </data>
+  <data name="ImportComputersFromActiveDirectoryDots" xml:space="preserve">
+    <value>Import computers from Active Directory...</value>
+  </data>
+  <data name="TargetProfileGroup" xml:space="preserve">
+    <value>Target profile group</value>
+  </data>
+  <data name="TargetProfileGroupWatermark" xml:space="preserve">
+    <value>Existing or new group name</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Source/NETworkManager.Utilities/ActiveDirectory/ActiveDirectoryComputerRecord.cs b/Source/NETworkManager.Utilities/ActiveDirectory/ActiveDirectoryComputerRecord.cs
new file mode 100644
index 0000000000..01eb8163cf
--- /dev/null
+++ b/Source/NETworkManager.Utilities/ActiveDirectory/ActiveDirectoryComputerRecord.cs
@@ -0,0 +1,8 @@
+namespace NETworkManager.Utilities.ActiveDirectory;
+
+/// <summary>
+/// Represents a computer account returned from Active Directory LDAP search.
+/// </summary>
+/// <param name="ProfileName">Display name for the profile (typically sAMAccountName without trailing '$').</param>
+/// <param name="DnsHostName">DNS host name used for RDP when present.</param>
+public readonly record struct ActiveDirectoryComputerRecord(string ProfileName, string DnsHostName);
diff --git a/Source/NETworkManager.Utilities/ActiveDirectory/ActiveDirectoryComputerSearcher.cs b/Source/NETworkManager.Utilities/ActiveDirectory/ActiveDirectoryComputerSearcher.cs
new file mode 100644
index 0000000000..709ad00c77
--- /dev/null
+++ b/Source/NETworkManager.Utilities/ActiveDirectory/ActiveDirectoryComputerSearcher.cs
@@ -0,0 +1,103 @@
+using System;
+using System.Collections.Generic;
+using System.DirectoryServices;
+using System.Runtime.InteropServices;
+
+namespace NETworkManager.Utilities.ActiveDirectory;
+
+/// <summary>
+/// Queries Active Directory for computer accounts under a search base, including subtrees.
+/// Uses the current Windows identity to bind to the directory.
+/// </summary>
+public static class ActiveDirectoryComputerSearcher
+{
+    private const int LdapPageSize = 500;
+
+    /// <summary>
+    /// Returns computer accounts under <paramref name="ldapSearchRoot"/> with subtree scope.
+    /// </summary>
+    /// <param name="ldapSearchRoot">Distinguished name or LDAP path (with or without LDAP:// prefix).</param>
+    /// <param name="excludeDisabledComputerAccounts">When true, computer accounts with ACCOUNTDISABLE are omitted.</param>
+    /// <returns>Sorted list by profile name.</returns>
+    /// <exception cref="ArgumentException">When <paramref name="ldapSearchRoot"/> is null or whitespace.</exception>
+    /// <exception cref="InvalidOperationException">When the directory search fails.</exception>
+    public static IReadOnlyList<ActiveDirectoryComputerRecord> GetComputersInSubtree(
+        string ldapSearchRoot,
+        bool excludeDisabledComputerAccounts)
+    {
+        ArgumentException.ThrowIfNullOrWhiteSpace(ldapSearchRoot);
+
+        var ldapPath = NormalizeLdapPath(ldapSearchRoot.Trim());
+
+        var ldapFilter = excludeDisabledComputerAccounts
+            ? "(&(&(objectCategory=computer)(objectClass=computer))(!(userAccountControl:1.2.840.113556.1.4.803:=2)))"
+            : "(&(objectCategory=computer)(objectClass=computer))";
+
+        try
+        {
+            using var directoryEntry = new DirectoryEntry(ldapPath);
+            using var directorySearcher = new DirectorySearcher(directoryEntry)
+            {
+                SearchScope = SearchScope.Subtree,
+                Filter = ldapFilter,
+                PageSize = LdapPageSize,
+                Tombstone = false
+            };
+
+            directorySearcher.PropertiesToLoad.Add("dnsHostName");
+            directorySearcher.PropertiesToLoad.Add("name");
+            directorySearcher.PropertiesToLoad.Add("sAMAccountName");
+
+            var computers = new List<ActiveDirectoryComputerRecord>();
+
+            using var searchResults = directorySearcher.FindAll();
+            foreach (SearchResult searchResult in searchResults)
+            {
+                var dnsHostName = GetFirstPropertyString(searchResult, "dnsHostName");
+                var nameAttribute = GetFirstPropertyString(searchResult, "name");
+                var samAccountName = GetFirstPropertyString(searchResult, "sAMAccountName");
+
+                var profileName = !string.IsNullOrEmpty(samAccountName)
+                    ? samAccountName.TrimEnd('$')
+                    : nameAttribute;
+
+                if (string.IsNullOrWhiteSpace(profileName))
+                    profileName = nameAttribute;
+
+                if (string.IsNullOrWhiteSpace(profileName))
+                    continue;
+
+                computers.Add(new ActiveDirectoryComputerRecord(profileName.Trim(), dnsHostName ?? string.Empty));
+            }
+
+            computers.Sort((left, right) =>
+                string.Compare(left.ProfileName, right.ProfileName, StringComparison.OrdinalIgnoreCase));
+
+            return computers;
+        }
+        catch (COMException exception)
+        {
+            throw new InvalidOperationException(
+                "Active Directory search failed. Verify the search base, permissions, and domain connectivity.",
+                exception);
+        }
+    }
+
+    private static string NormalizeLdapPath(string input)
+    {
+        if (input.StartsWith("LDAP://", StringComparison.OrdinalIgnoreCase) ||
+            input.StartsWith("LDAPS://", StringComparison.OrdinalIgnoreCase) ||
+            input.StartsWith("GC://", StringComparison.OrdinalIgnoreCase))
+            return input;
+
+        return "LDAP://" + input;
+    }
+
+    private static string GetFirstPropertyString(SearchResult searchResult, string propertyName)
+    {
+        if (!searchResult.Properties.Contains(propertyName) || searchResult.Properties[propertyName].Count == 0)
+            return string.Empty;
+
+        return searchResult.Properties[propertyName][0]?.ToString() ?? string.Empty;
+    }
+}
diff --git a/Source/NETworkManager.Validators/GroupNameValidator.cs b/Source/NETworkManager.Validators/GroupNameValidator.cs
index 920456e450..588f142a69 100644
--- a/Source/NETworkManager.Validators/GroupNameValidator.cs
+++ b/Source/NETworkManager.Validators/GroupNameValidator.cs
@@ -1,4 +1,4 @@
-using System.Globalization;
+using System.Globalization;
 using System.Windows.Controls;
 using NETworkManager.Localization.Resources;
 
@@ -10,6 +10,9 @@ public override ValidationResult Validate(object value, CultureInfo cultureInfo)
     {
         var groupName = value as string;
 
+        if (string.IsNullOrEmpty(groupName))
+            return ValidationResult.ValidResult;
+
         if (groupName.StartsWith("~"))
             return new ValidationResult(false,
                 string.Format(Strings.GroupNameCannotStartWithX, "~"));
diff --git a/Source/NETworkManager/ProfileDialogManager.cs b/Source/NETworkManager/ProfileDialogManager.cs
index 5f6d9c83f9..4feb9d3a27 100644
--- a/Source/NETworkManager/ProfileDialogManager.cs
+++ b/Source/NETworkManager/ProfileDialogManager.cs
@@ -1,4 +1,4 @@
-using MahApps.Metro.SimpleChildWindow;
+using MahApps.Metro.SimpleChildWindow;
 using NETworkManager.Controls;
 using NETworkManager.Localization.Resources;
 using NETworkManager.Models;
@@ -567,6 +567,32 @@ public static async Task ShowDeleteProfileDialog(Window parentWindow, IProfileMa
         ProfileManager.RemoveProfiles(profiles);
     }
 
+    public static Task ShowImportComputersFromActiveDirectoryDialog(Window parentWindow,
+        IProfileManagerMinimal viewModel, string suggestedTargetGroup)
+    {
+        var childWindow = new ImportAdComputersChildWindow(parentWindow);
+
+        void CloseChild()
+        {
+            childWindow.IsOpen = false;
+            Settings.ConfigurationManager.Current.IsChildWindowOpen = false;
+
+            viewModel.OnProfileManagerDialogClose();
+        }
+
+        var childWindowViewModel =
+            new ImportAdComputersViewModel(parentWindow, suggestedTargetGroup ?? string.Empty, CloseChild);
+
+        childWindow.Title = Strings.ImportComputersFromActiveDirectory;
+        childWindow.DataContext = childWindowViewModel;
+
+        viewModel.OnProfileManagerDialogOpen();
+
+        Settings.ConfigurationManager.Current.IsChildWindowOpen = true;
+
+        return parentWindow.ShowChildWindowAsync(childWindow);
+    }
+
     #endregion
 
     #region Dialog to add, edit and delete group
diff --git a/Source/NETworkManager/ViewModels/ImportAdComputersViewModel.cs b/Source/NETworkManager/ViewModels/ImportAdComputersViewModel.cs
new file mode 100644
index 0000000000..4c714ef365
--- /dev/null
+++ b/Source/NETworkManager/ViewModels/ImportAdComputersViewModel.cs
@@ -0,0 +1,237 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Input;
+using log4net;
+using MahApps.Metro.SimpleChildWindow;
+using NETworkManager.Controls;
+using NETworkManager.Localization.Resources;
+using NETworkManager.Profiles;
+using NETworkManager.Settings;
+using NETworkManager.Utilities;
+using NETworkManager.Utilities.ActiveDirectory;
+
+namespace NETworkManager.ViewModels;
+
+public sealed class ImportAdComputersViewModel : ViewModelBase
+{
+    private static readonly ILog Log = LogManager.GetLogger(typeof(ImportAdComputersViewModel));
+
+    private readonly Window _parentWindow;
+    private readonly Action _closeDialog;
+
+    private string _ldapSearchBase = string.Empty;
+    private string _targetGroupName = string.Empty;
+    private bool _excludeDisabledComputerAccounts = true;
+    private bool _isBusy;
+
+    public ImportAdComputersViewModel(Window parentWindow, string suggestedTargetGroup, Action closeDialog)
+    {
+        _parentWindow = parentWindow;
+        _closeDialog = closeDialog;
+
+        GroupNames = new ObservableCollection<string>(ProfileManager.GetGroupNames());
+        TargetGroupName = string.IsNullOrWhiteSpace(suggestedTargetGroup)
+            ? GroupNames.FirstOrDefault() ?? string.Empty
+            : suggestedTargetGroup;
+
+        ImportCommand = new RelayCommand(_ => ImportAction(), Import_CanExecute);
+        CancelCommand = new RelayCommand(_ => CancelAction());
+    }
+
+    public ObservableCollection<string> GroupNames { get; }
+
+    public string LdapSearchBase
+    {
+        get => _ldapSearchBase;
+        set
+        {
+            if (value == _ldapSearchBase)
+                return;
+
+            _ldapSearchBase = value;
+            OnPropertyChanged();
+            CommandManager.InvalidateRequerySuggested();
+        }
+    }
+
+    public string TargetGroupName
+    {
+        get => _targetGroupName;
+        set
+        {
+            if (value == _targetGroupName)
+                return;
+
+            _targetGroupName = value;
+            OnPropertyChanged();
+            CommandManager.InvalidateRequerySuggested();
+        }
+    }
+
+    public bool ExcludeDisabledComputerAccounts
+    {
+        get => _excludeDisabledComputerAccounts;
+        set
+        {
+            if (value == _excludeDisabledComputerAccounts)
+                return;
+
+            _excludeDisabledComputerAccounts = value;
+            OnPropertyChanged();
+        }
+    }
+
+    public bool IsBusy
+    {
+        get => _isBusy;
+        private set
+        {
+            if (value == _isBusy)
+                return;
+
+            _isBusy = value;
+            OnPropertyChanged();
+            CommandManager.InvalidateRequerySuggested();
+        }
+    }
+
+    public ICommand ImportCommand { get; }
+
+    public ICommand CancelCommand { get; }
+
+    private bool Import_CanExecute(object parameter)
+    {
+        if (IsBusy)
+            return false;
+
+        if (string.IsNullOrWhiteSpace(LdapSearchBase) || string.IsNullOrWhiteSpace(TargetGroupName))
+            return false;
+
+        var trimmedGroup = TargetGroupName.Trim();
+        if (trimmedGroup.StartsWith('~'))
+            return false;
+
+        return true;
+    }
+
+    private void CancelAction()
+    {
+        _closeDialog();
+    }
+
+    private async void ImportAction()
+    {
+        if (ProfileManager.LoadedProfileFile == null)
+        {
+            ConfigurationManager.OnDialogOpen();
+
+            await DialogHelper.ShowMessageAsync(_parentWindow, Strings.Error,
+                Strings.ActiveDirectoryImportRequiresProfileFile, ChildWindowIcon.Error);
+
+            ConfigurationManager.OnDialogClose();
+            return;
+        }
+
+        IsBusy = true;
+
+        try
+        {
+            var searchBase = LdapSearchBase.Trim();
+            var targetGroup = TargetGroupName.Trim();
+
+            IReadOnlyList<ActiveDirectoryComputerRecord> computers;
+
+            try
+            {
+                computers = await Task.Run(() =>
+                        ActiveDirectoryComputerSearcher.GetComputersInSubtree(searchBase,
+                            ExcludeDisabledComputerAccounts))
+                    .ConfigureAwait(true);
+            }
+            catch (Exception exception)
+            {
+                Log.Error("Active Directory computer import query failed.", exception);
+
+                ConfigurationManager.OnDialogOpen();
+
+                await DialogHelper.ShowMessageAsync(_parentWindow, Strings.Error,
+                    $"{Strings.ActiveDirectoryImportFailed}{Environment.NewLine}{Environment.NewLine}{exception.Message}",
+                    ChildWindowIcon.Error);
+
+                ConfigurationManager.OnDialogClose();
+                return;
+            }
+
+            var targetGroupInfo = ProfileManager.LoadedProfileFileData.Groups
+                .FirstOrDefault(group => group.Name.Equals(targetGroup, StringComparison.OrdinalIgnoreCase));
+
+            var existingProfileNames = new HashSet<string>(
+                targetGroupInfo?.Profiles.Select(profile => profile.Name) ?? [],
+                StringComparer.OrdinalIgnoreCase);
+
+            var importedCount = 0;
+            var skippedDuplicateCount = 0;
+            var skippedNoDnsCount = 0;
+
+            foreach (var computer in computers)
+            {
+                var dnsHostName = computer.DnsHostName.Trim();
+
+                if (string.IsNullOrWhiteSpace(dnsHostName))
+                {
+                    skippedNoDnsCount++;
+                    continue;
+                }
+
+                if (existingProfileNames.Contains(computer.ProfileName))
+                {
+                    skippedDuplicateCount++;
+                    continue;
+                }
+
+                var profile = CreateRemoteDesktopProfileForImportedComputer(computer.ProfileName, dnsHostName,
+                    targetGroup);
+
+                ProfileManager.AddProfile(profile);
+                existingProfileNames.Add(computer.ProfileName);
+                importedCount++;
+            }
+
+            ProfileManager.Save();
+
+            ConfigurationManager.OnDialogOpen();
+
+            await DialogHelper.ShowMessageAsync(_parentWindow, Strings.ImportComputersFromActiveDirectory,
+                string.Format(Strings.ActiveDirectoryImportSummary, importedCount, skippedDuplicateCount,
+                    skippedNoDnsCount),
+                ChildWindowIcon.Info);
+
+            ConfigurationManager.OnDialogClose();
+
+            _closeDialog();
+        }
+        finally
+        {
+            IsBusy = false;
+        }
+    }
+
+    private static ProfileInfo CreateRemoteDesktopProfileForImportedComputer(string profileName, string dnsHostName,
+        string targetGroup)
+    {
+        return new ProfileInfo
+        {
+            Name = profileName,
+            Host = dnsHostName,
+            Group = targetGroup,
+            RemoteDesktop_Enabled = true,
+            RemoteDesktop_InheritHost = true,
+            RemoteDesktop_Host = dnsHostName,
+            TagsCollection = new ObservableSetCollection<string>()
+        };
+    }
+}
diff --git a/Source/NETworkManager/ViewModels/RemoteDesktopHostViewModel.cs b/Source/NETworkManager/ViewModels/RemoteDesktopHostViewModel.cs
index 9b2a232621..cdab4a6a85 100644
--- a/Source/NETworkManager/ViewModels/RemoteDesktopHostViewModel.cs
+++ b/Source/NETworkManager/ViewModels/RemoteDesktopHostViewModel.cs
@@ -422,6 +422,21 @@ private void AddProfileAction()
             .ConfigureAwait(false);
     }
 
+    public ICommand ImportComputersFromActiveDirectoryCommand =>
+        new RelayCommand(_ => ImportComputersFromActiveDirectoryAction());
+
+    private void ImportComputersFromActiveDirectoryAction()
+    {
+        var suggestedTargetGroup = SelectedProfile?.Group;
+        if (string.IsNullOrWhiteSpace(suggestedTargetGroup))
+            suggestedTargetGroup = ProfileManager.GetGroupNames().FirstOrDefault() ?? string.Empty;
+
+        ProfileDialogManager
+            .ShowImportComputersFromActiveDirectoryDialog(Application.Current.MainWindow, this,
+                suggestedTargetGroup)
+            .ConfigureAwait(false);
+    }
+
     private bool ModifyProfile_CanExecute(object obj)
     {
         return SelectedProfile is { IsDynamic: false };
diff --git a/Source/NETworkManager/Views/ImportAdComputersChildWindow.xaml b/Source/NETworkManager/Views/ImportAdComputersChildWindow.xaml
new file mode 100644
index 0000000000..9dab8cac6a
--- /dev/null
+++ b/Source/NETworkManager/Views/ImportAdComputersChildWindow.xaml
@@ -0,0 +1,113 @@
+<simpleChildWindow:ChildWindow x:Class="NETworkManager.Views.ImportAdComputersChildWindow"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:validators="clr-namespace:NETworkManager.Validators;assembly=NETworkManager.Validators"
+             xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls"
+             xmlns:converters="clr-namespace:NETworkManager.Converters;assembly=NETworkManager.Converters"
+             xmlns:viewModels="clr-namespace:NETworkManager.ViewModels"
+             xmlns:localization="clr-namespace:NETworkManager.Localization.Resources;assembly=NETworkManager.Localization"
+             xmlns:simpleChildWindow="clr-namespace:MahApps.Metro.SimpleChildWindow;assembly=MahApps.Metro.SimpleChildWindow"
+             CloseButtonCommand="{Binding CancelCommand}"
+             Style="{StaticResource DefaultChildWindow}"
+             Loaded="ChildWindow_OnLoaded"
+             mc:Ignorable="d" d:DataContext="{d:DesignInstance viewModels:ImportAdComputersViewModel}">
+    <simpleChildWindow:ChildWindow.Resources>
+        <converters:BooleanToVisibilityCollapsedConverter x:Key="BooleanToVisibilityCollapsedConverter" />
+    </simpleChildWindow:ChildWindow.Resources>
+    <Grid Margin="10">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="20" />
+            <RowDefinition Height="Auto" />
+        </Grid.RowDefinitions>
+        <Grid Grid.Row="0">
+            <Grid.Resources>
+                <Style TargetType="{x:Type TextBlock}" BasedOn="{StaticResource CenterTextBlock}" />
+            </Grid.Resources>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="1*" />
+                <ColumnDefinition Width="10" />
+                <ColumnDefinition Width="2*" />
+            </Grid.ColumnDefinitions>
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="10" />
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="10" />
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="10" />
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="10" />
+                <RowDefinition Height="Auto" />
+            </Grid.RowDefinitions>
+            <TextBlock Grid.Column="0" Grid.Row="0" Text="{x:Static localization:Strings.ActiveDirectorySearchBase}" />
+            <TextBox x:Name="TextBoxLdapSearchBase" Grid.Column="2" Grid.Row="0"
+                     mah:TextBoxHelper.Watermark="{x:Static localization:Strings.ActiveDirectorySearchBaseWatermark}"
+                     Style="{StaticResource DefaultTextBox}">
+                <TextBox.Text>
+                    <Binding Path="LdapSearchBase" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged">
+                        <Binding.ValidationRules>
+                            <validators:EmptyValidator ValidatesOnTargetUpdated="True" />
+                        </Binding.ValidationRules>
+                    </Binding>
+                </TextBox.Text>
+            </TextBox>
+            <TextBlock Grid.Column="0" Grid.Row="2" Text="{x:Static localization:Strings.TargetProfileGroup}" />
+            <ComboBox x:Name="ComboBoxTargetGroup" Grid.Column="2" Grid.Row="2"
+                      Style="{StaticResource EditableComboBox}"
+                      ItemsSource="{Binding GroupNames}"
+                      mah:TextBoxHelper.Watermark="{x:Static localization:Strings.TargetProfileGroupWatermark}">
+                <ComboBox.Text>
+                    <Binding Path="TargetGroupName" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged">
+                        <Binding.ValidationRules>
+                            <validators:EmptyValidator ValidatesOnTargetUpdated="True" />
+                            <validators:GroupNameValidator ValidatesOnTargetUpdated="True" />
+                        </Binding.ValidationRules>
+                    </Binding>
+                </ComboBox.Text>
+            </ComboBox>
+            <TextBlock Grid.Column="0" Grid.Row="4" Text="{x:Static localization:Strings.ActiveDirectoryImportOptions}" />
+            <CheckBox Grid.Column="2" Grid.Row="4"
+                      Content="{x:Static localization:Strings.ExcludeDisabledComputerAccounts}"
+                      IsChecked="{Binding ExcludeDisabledComputerAccounts}"
+                      Style="{StaticResource DefaultCheckBox}" />
+            <TextBlock Grid.Column="0" Grid.Row="6" Grid.ColumnSpan="3"
+                       Text="{x:Static localization:Strings.ActiveDirectoryImportUsesCurrentCredentials}"
+                       TextWrapping="Wrap"
+                       Style="{StaticResource MessageTextBlock}" />
+            <mah:ProgressRing Grid.Column="2" Grid.Row="8"
+                              IsActive="{Binding IsBusy}"
+                              Visibility="{Binding IsBusy, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}"
+                              Width="32" Height="32"
+                              HorizontalAlignment="Left" />
+        </Grid>
+        <StackPanel Grid.Row="2" Orientation="Horizontal" HorizontalAlignment="Right">
+            <Button Content="{x:Static localization:Strings.Import}" Command="{Binding ImportCommand}"
+                    IsDefault="True" Margin="0,0,10,0">
+                <Button.Style>
+                    <Style TargetType="{x:Type Button}" BasedOn="{StaticResource HighlightedButton}">
+                        <Style.Triggers>
+                            <DataTrigger
+                                Binding="{Binding ElementName=TextBoxLdapSearchBase, Path=(Validation.HasError)}"
+                                Value="True">
+                                <Setter Property="IsEnabled" Value="False" />
+                            </DataTrigger>
+                            <DataTrigger
+                                Binding="{Binding ElementName=ComboBoxTargetGroup, Path=(Validation.HasError)}"
+                                Value="True">
+                                <Setter Property="IsEnabled" Value="False" />
+                            </DataTrigger>
+                            <DataTrigger Binding="{Binding IsBusy}" Value="True">
+                                <Setter Property="IsEnabled" Value="False" />
+                            </DataTrigger>
+                        </Style.Triggers>
+                    </Style>
+                </Button.Style>
+            </Button>
+            <Button Content="{x:Static localization:Strings.Cancel}" Command="{Binding CancelCommand}" IsCancel="True"
+                    Style="{StaticResource DefaultButton}" />
+        </StackPanel>
+    </Grid>
+</simpleChildWindow:ChildWindow>
diff --git a/Source/NETworkManager/Views/ImportAdComputersChildWindow.xaml.cs b/Source/NETworkManager/Views/ImportAdComputersChildWindow.xaml.cs
new file mode 100644
index 0000000000..234de655ec
--- /dev/null
+++ b/Source/NETworkManager/Views/ImportAdComputersChildWindow.xaml.cs
@@ -0,0 +1,29 @@
+using System;
+using System.Windows;
+using System.Windows.Threading;
+
+namespace NETworkManager.Views;
+
+public partial class ImportAdComputersChildWindow
+{
+    public ImportAdComputersChildWindow(Window parentWindow)
+    {
+        InitializeComponent();
+
+        ChildWindowMaxWidth = 720;
+        ChildWindowWidth = Math.Min(640, Math.Max(480, parentWindow.ActualWidth * 0.55));
+
+        parentWindow.SizeChanged += (_, _) =>
+        {
+            ChildWindowWidth = Math.Min(640, Math.Max(480, parentWindow.ActualWidth * 0.55));
+        };
+    }
+
+    private void ChildWindow_OnLoaded(object sender, RoutedEventArgs e)
+    {
+        Dispatcher.BeginInvoke(DispatcherPriority.ContextIdle, new Action(delegate
+        {
+            TextBoxLdapSearchBase.Focus();
+        }));
+    }
+}
diff --git a/Source/NETworkManager/Views/RemoteDesktopHostView.xaml b/Source/NETworkManager/Views/RemoteDesktopHostView.xaml
index 0c101d0561..aaeaf74866 100644
--- a/Source/NETworkManager/Views/RemoteDesktopHostView.xaml
+++ b/Source/NETworkManager/Views/RemoteDesktopHostView.xaml
@@ -1,4 +1,4 @@
-<UserControl x:Class="NETworkManager.Views.RemoteDesktopHostView"
+<UserControl x:Class="NETworkManager.Views.RemoteDesktopHostView"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
@@ -297,6 +297,8 @@
                             <ColumnDefinition Width="Auto" />
                             <ColumnDefinition Width="10" />
                             <ColumnDefinition Width="Auto" />
+                            <ColumnDefinition Width="10" />
+                            <ColumnDefinition Width="Auto" />
                         </Grid.ColumnDefinitions>
                         <ToggleButton Grid.Column="0" Grid.Row="0"
                                       IsChecked="{Binding ExpandProfileView}"
@@ -459,6 +461,29 @@
                             </Border>
                         </Popup>
                         <Button Grid.Column="6" Grid.Row="0"
+                                Focusable="False"
+                                Style="{StaticResource CleanButton}"
+                                Command="{Binding ImportComputersFromActiveDirectoryCommand}"
+                                ToolTip="{x:Static localization:Strings.ImportComputersFromActiveDirectoryDots}">
+                            <Rectangle Width="16" Height="16">
+                                <Rectangle.OpacityMask>
+                                    <VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=Domain}" />
+                                </Rectangle.OpacityMask>
+                                <Rectangle.Style>
+                                    <Style TargetType="{x:Type Rectangle}">
+                                        <Setter Property="Fill" Value="{DynamicResource MahApps.Brushes.Gray3}" />
+                                        <Style.Triggers>
+                                            <DataTrigger
+                                                Binding="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Button}}, Path=IsMouseOver}"
+                                                Value="True">
+                                                <Setter Property="Fill" Value="{DynamicResource MahApps.Brushes.Gray5}" />
+                                            </DataTrigger>
+                                        </Style.Triggers>
+                                    </Style>
+                                </Rectangle.Style>
+                            </Rectangle>
+                        </Button>
+                        <Button Grid.Column="8" Grid.Row="0"
                                 Focusable="False"
                                 Style="{StaticResource CleanButton}"
                                 Command="{Binding AddProfileCommand}"

From 07a3cc12436335d39b85dc511a7424b764a9cbf1 Mon Sep 17 00:00:00 2001
From: Tyrix <578264+Tyrix@users.noreply.github.com>
Date: Fri, 27 Mar 2026 12:15:50 +0100
Subject: [PATCH 2/3] Feature (settings): remember Remote Desktop AD import
 LDAP search base

Store RemoteDesktop_ActiveDirectoryImportLdapSearchBase after a successful directory query and prefill the import dialog on next open.
---
 .../NETworkManager.Settings/SettingsInfo.cs   | 20 ++++++++++++++++++-
 .../ViewModels/ImportAdComputersViewModel.cs  |  5 +++++
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/Source/NETworkManager.Settings/SettingsInfo.cs b/Source/NETworkManager.Settings/SettingsInfo.cs
index 01f641b0b4..2abc178331 100644
--- a/Source/NETworkManager.Settings/SettingsInfo.cs
+++ b/Source/NETworkManager.Settings/SettingsInfo.cs
@@ -1,4 +1,4 @@
-using DnsClient;
+using DnsClient;
 using Lextm.SharpSnmpLib.Messaging;
 using NETworkManager.Controls;
 using NETworkManager.Models;
@@ -2682,6 +2682,24 @@ public double RemoteDesktop_ProfileWidth
         }
     }
 
+    private string _remoteDesktop_ActiveDirectoryImportLdapSearchBase;
+
+    /// <summary>
+    ///     Last LDAP search base (OU DN) used for Remote Desktop Active Directory computer import.
+    /// </summary>
+    public string RemoteDesktop_ActiveDirectoryImportLdapSearchBase
+    {
+        get => _remoteDesktop_ActiveDirectoryImportLdapSearchBase;
+        set
+        {
+            if (value == _remoteDesktop_ActiveDirectoryImportLdapSearchBase)
+                return;
+
+            _remoteDesktop_ActiveDirectoryImportLdapSearchBase = value;
+            OnPropertyChanged();
+        }
+    }
+
     #endregion
 
     #region PowerShell
diff --git a/Source/NETworkManager/ViewModels/ImportAdComputersViewModel.cs b/Source/NETworkManager/ViewModels/ImportAdComputersViewModel.cs
index 4c714ef365..6420a8d5ed 100644
--- a/Source/NETworkManager/ViewModels/ImportAdComputersViewModel.cs
+++ b/Source/NETworkManager/ViewModels/ImportAdComputersViewModel.cs
@@ -38,6 +38,8 @@ public ImportAdComputersViewModel(Window parentWindow, string suggestedTargetGro
             ? GroupNames.FirstOrDefault() ?? string.Empty
             : suggestedTargetGroup;
 
+        LdapSearchBase = SettingsManager.Current.RemoteDesktop_ActiveDirectoryImportLdapSearchBase ?? string.Empty;
+
         ImportCommand = new RelayCommand(_ => ImportAction(), Import_CanExecute);
         CancelCommand = new RelayCommand(_ => CancelAction());
     }
@@ -166,6 +168,9 @@ await DialogHelper.ShowMessageAsync(_parentWindow, Strings.Error,
                 return;
             }
 
+            SettingsManager.Current.RemoteDesktop_ActiveDirectoryImportLdapSearchBase = searchBase;
+            SettingsManager.Save();
+
             var targetGroupInfo = ProfileManager.LoadedProfileFileData.Groups
                 .FirstOrDefault(group => group.Name.Equals(targetGroup, StringComparison.OrdinalIgnoreCase));
 

From 5f5aaad9430e558a7ad01e012ebb090a72fb05ac Mon Sep 17 00:00:00 2001
From: Tyrix <578264+Tyrix@users.noreply.github.com>
Date: Fri, 27 Mar 2026 12:39:56 +0100
Subject: [PATCH 3/3] Documentation: Edit contributors list

---
 CONTRIBUTORS.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index 4976f09bb7..ebc3e3ceb5 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -13,6 +13,7 @@ List of all contributors.
 - EBWeist
 - mdawsonuk
 - labre_rdc
+- Tyrix
 
 ## Translators / reviewers on Transifex