From 6869decf4bfabde36dfdef840afd9e7d27bfd257 Mon Sep 17 00:00:00 2001
From: BornToBeRoot <16019165+BornToBeRoot@users.noreply.github.com>
Date: Sun, 26 Oct 2025 15:48:44 +0100
Subject: [PATCH 1/5] Feature: RDP Admin session

---
 .../Resources/Strings.Designer.cs             |  10 ++
 .../Resources/Strings.resx                    |   3 +
 .../RemoteDesktop/RemoteDesktop.cs            |  16 +--
 .../RemoteDesktop/RemoteDesktopSessionInfo.cs |   1 +
 .../Controls/RemoteDesktopControl.xaml.cs     |   7 +-
 .../RemoteDesktopConnectViewModel.cs          | 129 +++++++++++-------
 .../ViewModels/RemoteDesktopHostViewModel.cs  |  19 ++-
 .../Views/RemoteDesktopConnectDialog.xaml     |  20 ++-
 8 files changed, 137 insertions(+), 68 deletions(-)

diff --git a/Source/NETworkManager.Localization/Resources/Strings.Designer.cs b/Source/NETworkManager.Localization/Resources/Strings.Designer.cs
index 7474254302..9cfdb253aa 100644
--- a/Source/NETworkManager.Localization/Resources/Strings.Designer.cs
+++ b/Source/NETworkManager.Localization/Resources/Strings.Designer.cs
@@ -1,6 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -644,6 +645,15 @@ public static string AdjustScreenAutomatically {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Admin (console) session.
+        /// </summary>
+        public static string AdminConsoleSession {
+            get {
+                return ResourceManager.GetString("AdminConsoleSession", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Administrator.
         /// </summary>
diff --git a/Source/NETworkManager.Localization/Resources/Strings.resx b/Source/NETworkManager.Localization/Resources/Strings.resx
index 56be8078c4..ec8798c515 100644
--- a/Source/NETworkManager.Localization/Resources/Strings.resx
+++ b/Source/NETworkManager.Localization/Resources/Strings.resx
@@ -3996,4 +3996,7 @@ Right-click for more options.</value>
   <data name="HelpMessage_UseCustomThemes" xml:space="preserve">
     <value>Use custom themes to personalize the appearance of the application. You can edit or add theme in the "Program Folder &gt; Themes" directory. For more details, refer to the documentation.</value>
   </data>
+  <data name="AdminConsoleSession" xml:space="preserve">
+    <value>Admin (console) session</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Source/NETworkManager.Models/RemoteDesktop/RemoteDesktop.cs b/Source/NETworkManager.Models/RemoteDesktop/RemoteDesktop.cs
index b95f980f0d..f6a756cb8d 100644
--- a/Source/NETworkManager.Models/RemoteDesktop/RemoteDesktop.cs
+++ b/Source/NETworkManager.Models/RemoteDesktop/RemoteDesktop.cs
@@ -4,8 +4,8 @@ namespace NETworkManager.Models.RemoteDesktop;
 
 public static class RemoteDesktop
 {
-    public static List<string> ScreenResolutions => new()
-    {
+    public static List<string> ScreenResolutions =>
+    [
         "640x480",
         "800x600",
         "1024x768",
@@ -18,15 +18,15 @@ public static class RemoteDesktop
         "1400x1050",
         "1680x1050",
         "1920x1080"
-    };
+    ];
 
-    public static List<int> ColorDepths => new()
-    {
+    public static List<int> ColorDepths =>
+    [
         15,
         16,
         24,
         32
-    };
+    ];
 
     public static RemoteDesktopKeystrokeInfo GetKeystroke(Keystroke keystroke)
     {
@@ -35,8 +35,8 @@ public static RemoteDesktopKeystrokeInfo GetKeystroke(Keystroke keystroke)
         switch (keystroke)
         {
             case Keystroke.CtrlAltDel:
-                info.ArrayKeyUp = new[] { false, false, false, true, true, true };
-                info.KeyData = new[] { 0x1d, 0x38, 0x53, 0x53, 0x38, 0x1d };
+                info.ArrayKeyUp = [false, false, false, true, true, true];
+                info.KeyData = [0x1d, 0x38, 0x53, 0x53, 0x38, 0x1d];
                 break;
         }
 
diff --git a/Source/NETworkManager.Models/RemoteDesktop/RemoteDesktopSessionInfo.cs b/Source/NETworkManager.Models/RemoteDesktop/RemoteDesktopSessionInfo.cs
index 1e50f1ff59..106a19b7be 100644
--- a/Source/NETworkManager.Models/RemoteDesktop/RemoteDesktopSessionInfo.cs
+++ b/Source/NETworkManager.Models/RemoteDesktop/RemoteDesktopSessionInfo.cs
@@ -9,6 +9,7 @@ public class RemoteDesktopSessionInfo
     public string Username { get; set; }
     public string Domain { get; set; }
     public SecureString Password { get; set; }
+    public bool AdminSession { get; set; }
     public int Port { get; set; }
     public bool AdjustScreenAutomatically { get; set; }
     public bool UseCurrentViewSize { get; set; }
diff --git a/Source/NETworkManager/Controls/RemoteDesktopControl.xaml.cs b/Source/NETworkManager/Controls/RemoteDesktopControl.xaml.cs
index 3ad004fdac..fde9e58ca5 100644
--- a/Source/NETworkManager/Controls/RemoteDesktopControl.xaml.cs
+++ b/Source/NETworkManager/Controls/RemoteDesktopControl.xaml.cs
@@ -212,6 +212,9 @@ private void Connect()
             RdpClient.AdvancedSettings9.ClearTextPassword = SecureStringHelper.ConvertToString(_sessionInfo.Password);
         }
 
+        // Admin (console) session
+        RdpClient.AdvancedSettings9.ConnectToAdministerServer = _sessionInfo.AdminSession;
+
         // Network
         RdpClient.AdvancedSettings9.RDPPort = _sessionInfo.Port;
 
@@ -716,8 +719,4 @@ private void WindowsFormsHost_DpiChanged(object sender, DpiChangedEventArgs e)
         AdjustScreen(force: true);
     }
     #endregion
-
-
-
-
 }
diff --git a/Source/NETworkManager/ViewModels/RemoteDesktopConnectViewModel.cs b/Source/NETworkManager/ViewModels/RemoteDesktopConnectViewModel.cs
index b5da531b84..fc445710e0 100644
--- a/Source/NETworkManager/ViewModels/RemoteDesktopConnectViewModel.cs
+++ b/Source/NETworkManager/ViewModels/RemoteDesktopConnectViewModel.cs
@@ -1,56 +1,18 @@
-using System;
+using NETworkManager.Settings;
+using NETworkManager.Utilities;
+using System;
 using System.ComponentModel;
 using System.Security;
 using System.Windows.Data;
 using System.Windows.Input;
-using NETworkManager.Settings;
-using NETworkManager.Utilities;
 
 namespace NETworkManager.ViewModels;
 
 public class RemoteDesktopConnectViewModel : ViewModelBase
 {
+    #region Variables
     private bool _connectAs;
 
-    private string _domain;
-
-    private string _host;
-
-    private bool _isPasswordEmpty = true;
-
-    private string _name;
-
-    private SecureString _password = new();
-
-    private bool _useCredentials;
-
-    private string _username;
-
-    public RemoteDesktopConnectViewModel(Action<RemoteDesktopConnectViewModel> connectCommand,
-        Action<RemoteDesktopConnectViewModel> cancelHandler, (string Name, string Host)? connectAsOptions = null)
-    {
-        ConnectCommand = new RelayCommand(_ => connectCommand(this));
-        CancelCommand = new RelayCommand(_ => cancelHandler(this));
-
-        if (connectAsOptions == null)
-        {
-            HostHistoryView = CollectionViewSource.GetDefaultView(SettingsManager.Current.RemoteDesktop_HostHistory);
-        }
-        else
-        {
-            ConnectAs = true;
-
-            UseCredentials = true;
-
-            Name = connectAsOptions.Value.Name;
-            Host = connectAsOptions.Value.Host;
-        }
-    }
-
-    public ICommand ConnectCommand { get; }
-
-    public ICommand CancelCommand { get; }
-
     public bool ConnectAs
     {
         get => _connectAs;
@@ -64,6 +26,8 @@ public bool ConnectAs
         }
     }
 
+    private string _name;
+
     public string Name
     {
         get => _name;
@@ -77,6 +41,8 @@ public string Name
         }
     }
 
+    private string _host;
+
     public string Host
     {
         get => _host;
@@ -92,6 +58,8 @@ public string Host
 
     public ICollectionView HostHistoryView { get; }
 
+    private bool _useCredentials;
+
     public bool UseCredentials
     {
         get => _useCredentials;
@@ -105,6 +73,23 @@ public bool UseCredentials
         }
     }
 
+    private string _domain;
+
+    public string Domain
+    {
+        get => _domain;
+        set
+        {
+            if (value == _domain)
+                return;
+
+            _domain = value;
+            OnPropertyChanged();
+        }
+    }
+
+    private string _username;
+
     public string Username
     {
         get => _username;
@@ -118,19 +103,23 @@ public string Username
         }
     }
 
-    public string Domain
+    private bool _isPasswordEmpty = true;
+
+    public bool IsPasswordEmpty
     {
-        get => _domain;
+        get => _isPasswordEmpty;
         set
         {
-            if (value == _domain)
+            if (value == _isPasswordEmpty)
                 return;
 
-            _domain = value;
+            _isPasswordEmpty = value;
             OnPropertyChanged();
         }
     }
 
+    private SecureString _password = new();
+
     public SecureString Password
     {
         get => _password;
@@ -147,18 +136,57 @@ public SecureString Password
         }
     }
 
-    public bool IsPasswordEmpty
+    private bool _adminSession;
+
+    public bool AdminSession
     {
-        get => _isPasswordEmpty;
+        get => _adminSession;
         set
         {
-            if (value == _isPasswordEmpty)
+            if (value == _adminSession)
                 return;
 
-            _isPasswordEmpty = value;
+            _adminSession = value;
             OnPropertyChanged();
         }
     }
+    #endregion
+
+    #region Constructor
+
+    public RemoteDesktopConnectViewModel(Action<RemoteDesktopConnectViewModel> connectCommand,
+        Action<RemoteDesktopConnectViewModel> cancelHandler, (string Name, string Host, bool AdminSession)? connectAsOptions = null)
+    {
+        ConnectCommand = new RelayCommand(_ => connectCommand(this));
+        CancelCommand = new RelayCommand(_ => cancelHandler(this));
+
+        if (connectAsOptions == null)
+        {
+            HostHistoryView = CollectionViewSource.GetDefaultView(SettingsManager.Current.RemoteDesktop_HostHistory);
+        }
+        else
+        {
+            ConnectAs = true;
+
+            UseCredentials = true;
+
+            Name = connectAsOptions.Value.Name;
+            Host = connectAsOptions.Value.Host;
+
+            AdminSession = connectAsOptions.Value.AdminSession;
+        }
+    }
+
+    #endregion
+
+    #region Commands
+
+    public ICommand ConnectCommand { get; }
+
+    public ICommand CancelCommand { get; }
+    #endregion
+
+    #region Methods
 
     /// <summary>
     ///     Check if the passwords are valid.
@@ -167,4 +195,5 @@ private void ValidatePassword()
     {
         IsPasswordEmpty = Password == null || Password.Length == 0;
     }
+    #endregion
 }
\ No newline at end of file
diff --git a/Source/NETworkManager/ViewModels/RemoteDesktopHostViewModel.cs b/Source/NETworkManager/ViewModels/RemoteDesktopHostViewModel.cs
index 66da810e9c..5573aa979b 100644
--- a/Source/NETworkManager/ViewModels/RemoteDesktopHostViewModel.cs
+++ b/Source/NETworkManager/ViewModels/RemoteDesktopHostViewModel.cs
@@ -205,7 +205,7 @@ public bool IsProfileFilterSet
 
     private readonly GroupExpanderStateStore _groupExpanderStateStore = new();
     public GroupExpanderStateStore GroupExpanderStateStore => _groupExpanderStateStore;
-    
+
     private bool _canProfileWidthChange = true;
     private double _tempProfileWidth;
 
@@ -481,7 +481,7 @@ private void ClearProfileFilterAction()
         _searchDisabled = true;
         Search = string.Empty;
         _searchDisabled = false;
-        
+
         foreach (var tag in ProfileFilterTags)
             tag.IsSelected = false;
 
@@ -504,7 +504,7 @@ private void CollapseAllProfileGroupsAction()
     {
         SetIsExpandedForAllProfileGroups(false);
     }
-    
+
     public ItemActionCallback CloseItemCommand => CloseItemAction;
 
     private static void CloseItemAction(ItemActionCallbackArgs<TabablzControl> args)
@@ -552,6 +552,8 @@ private async Task Connect(string host = null)
                 sessionInfo.Password = instance.Password;
             }
 
+            sessionInfo.AdminSession = instance.AdminSession;
+
             // Add to history
             // Note: The history can only be updated after the values have been read.
             //       Otherwise, in some cases, incorrect values are taken over.
@@ -612,12 +614,19 @@ private async Task ConnectProfileAs()
                 sessionInfo.Password = instance.Password;
             }
 
+            sessionInfo.AdminSession = instance.AdminSession;
+
             Connect(sessionInfo, instance.Name);
         }, async _ =>
         {
             await _dialogCoordinator.HideMetroDialogAsync(this, customDialog);
             ConfigurationManager.OnDialogClose();
-        }, (profileInfo.Name, profileInfo.RemoteDesktop_Host));
+        },
+        (
+            profileInfo.Name,
+            profileInfo.RemoteDesktop_Host,
+            true
+        ));
 
         customDialog.Content = new RemoteDesktopConnectDialog
         {
@@ -659,7 +668,7 @@ private void SetIsExpandedForAllProfileGroups(bool isExpanded)
         foreach (var group in Profiles.Groups.Cast<CollectionViewGroup>())
             GroupExpanderStateStore[group.Name.ToString()] = isExpanded;
     }
-    
+
     private void ResizeProfile(bool dueToChangedSize)
     {
         _canProfileWidthChange = false;
diff --git a/Source/NETworkManager/Views/RemoteDesktopConnectDialog.xaml b/Source/NETworkManager/Views/RemoteDesktopConnectDialog.xaml
index 18bdb0454a..252b13bd9c 100644
--- a/Source/NETworkManager/Views/RemoteDesktopConnectDialog.xaml
+++ b/Source/NETworkManager/Views/RemoteDesktopConnectDialog.xaml
@@ -22,6 +22,8 @@
             <RowDefinition Height="Auto" />
             <RowDefinition Height="10" />
             <RowDefinition Height="Auto" />
+            <RowDefinition Height="10" />
+            <RowDefinition Height="Auto" />
         </Grid.RowDefinitions>
         <Grid Grid.Row="0">
             <Grid.Resources>
@@ -126,7 +128,23 @@
                 </interactivity:Interaction.Behaviors>
             </PasswordBox>
         </Grid>
-        <StackPanel Grid.Row="3" Orientation="Horizontal" HorizontalAlignment="Right">
+        <Grid Grid.Row="3">
+            <Grid.Resources>
+                <Style TargetType="{x:Type TextBlock}" BasedOn="{StaticResource CenterTextBlock}" />
+                <Style TargetType="{x:Type TextBox}" BasedOn="{StaticResource DefaultTextBox}" />
+            </Grid.Resources>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="1*" />
+                <ColumnDefinition Width="10" />
+                <ColumnDefinition Width="1*" />
+            </Grid.ColumnDefinitions>
+            <Grid.RowDefinitions>                
+                <RowDefinition Height="Auto" />
+            </Grid.RowDefinitions>            
+            <TextBlock Grid.Column="0" Grid.Row="0" Text="{x:Static localization:Strings.AdminConsoleSession}" />
+            <mah:ToggleSwitch Grid.Column="2" Grid.Row="0" OffContent="" OnContent="" IsOn="{Binding AdminSession}" />
+        </Grid>
+        <StackPanel Grid.Row="5" Orientation="Horizontal" HorizontalAlignment="Right">
             <Button Content="{x:Static localization:Strings.Connect}" Command="{Binding ConnectCommand}"
                     IsDefault="True" Margin="0,0,10,0">
                 <Button.Style>

From a8a78a776a8b944f42d7bd7f5fc4ed00586ac7ae Mon Sep 17 00:00:00 2001
From: BornToBeRoot <16019165+BornToBeRoot@users.noreply.github.com>
Date: Sun, 26 Oct 2025 16:13:35 +0100
Subject: [PATCH 2/5] Chore: Upgrade & #3216

---
 Source/GlobalAssemblyInfo.cs           | 4 ++--
 Website/docs/changelog/next-release.md | 6 +++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/Source/GlobalAssemblyInfo.cs b/Source/GlobalAssemblyInfo.cs
index 9f4ab23345..8d752ce11e 100644
--- a/Source/GlobalAssemblyInfo.cs
+++ b/Source/GlobalAssemblyInfo.cs
@@ -6,5 +6,5 @@
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
-[assembly: AssemblyVersion("2025.8.11.0")]
-[assembly: AssemblyFileVersion("2025.8.11.0")]
+[assembly: AssemblyVersion("2025.10.18.0")]
+[assembly: AssemblyFileVersion("2025.10.18.0")]
diff --git a/Website/docs/changelog/next-release.md b/Website/docs/changelog/next-release.md
index ec49b54570..66230d16bc 100644
--- a/Website/docs/changelog/next-release.md
+++ b/Website/docs/changelog/next-release.md
@@ -19,6 +19,10 @@ Release date: **xx.xx.2025**
 
 ## What's new?
 
+**Remote Desktop**
+
+- Flag to enable `Admin (console) session` added to the RDP connect, profile and group dialogs. This flag allows connecting to the console session of the remote computer. [#3216](https://github.com/BornToBeRoot/NETworkManager/pull/3216)
+
 ## Improvements
 
 ## Bug Fixes
@@ -29,4 +33,4 @@ Release date: **xx.xx.2025**
 - Documentation updated
 - Code cleanup & refactoring
 - Language files updated via [#transifex](https://github.com/BornToBeRoot/NETworkManager/pulls?q=author%3Aapp%2Ftransifex-integration)
-- Dependencies updated via [#dependabot](https://github.com/BornToBeRoot/NETworkManager/pulls?q=author%3Aapp%2Fdependabot) [#3190](https://github.com/BornToBeRoot/NETworkManager/pull/3190)
+- Dependencies updated via [#dependabot](https://github.com/BornToBeRoot/NETworkManager/pulls?q=author%3Aapp%2Fdependabot)

From cebd23b9d0d7e45cf463aa892b8d0947c69a91f4 Mon Sep 17 00:00:00 2001
From: BornToBeRoot <16019165+BornToBeRoot@users.noreply.github.com>
Date: Sun, 26 Oct 2025 23:00:23 +0100
Subject: [PATCH 3/5] Feature: Use childwindow

---
 Source/NETworkManager/App.xaml                |  1 +
 Source/NETworkManager/ProfileDialogManager.cs | 10 +-
 .../Resources/Styles/ChildWindowStyles.xaml   | 16 ++++
 .../Resources/Styles/ToolTipStyles.xaml       |  2 +-
 .../ViewModels/RemoteDesktopHostViewModel.cs  | 63 +++++++------
 ...entialsPasswordProfileFileChildWindow.xaml | 13 +--
 .../Views/ExportChildWindow.xaml              | 11 +--
 .../HostsFileEditorEntryChildWindow.xaml      | 11 +--
 .../Views/OKCancelInfoMessageChildWindow.xaml | 12 +--
 .../Views/OKMessageChildWindow.xaml           | 12 +--
 ...l => RemoteDesktopConnectChildWindow.xaml} | 92 ++++++++++---------
 .../RemoteDesktopConnectChildWindow.xaml.cs   | 21 +++++
 .../Views/RemoteDesktopConnectDialog.xaml.cs  | 16 ----
 .../Views/UpgradeChildWindow.xaml             | 12 +--
 .../Views/WelcomeChildWindow.xaml             | 14 +--
 15 files changed, 144 insertions(+), 162 deletions(-)
 create mode 100644 Source/NETworkManager/Resources/Styles/ChildWindowStyles.xaml
 rename Source/NETworkManager/Views/{RemoteDesktopConnectDialog.xaml => RemoteDesktopConnectChildWindow.xaml} (68%)
 create mode 100644 Source/NETworkManager/Views/RemoteDesktopConnectChildWindow.xaml.cs
 delete mode 100644 Source/NETworkManager/Views/RemoteDesktopConnectDialog.xaml.cs

diff --git a/Source/NETworkManager/App.xaml b/Source/NETworkManager/App.xaml
index ea78b717b3..059b0654ca 100644
--- a/Source/NETworkManager/App.xaml
+++ b/Source/NETworkManager/App.xaml
@@ -26,6 +26,7 @@
                 <!-- Styles -->
                 <ResourceDictionary Source="/Resources/Styles/ButtonStyles.xaml" />
                 <ResourceDictionary Source="/Resources/Styles/CheckBoxStyles.xaml" />
+                <ResourceDictionary Source="/Resources/Styles/ChildWindowStyles.xaml" />
                 <ResourceDictionary Source="/Resources/Styles/ContextMenuStyles.xaml" />
                 <ResourceDictionary Source="/Resources/Styles/DataGridStyles.xaml" />
                 <ResourceDictionary Source="/Resources/Styles/DropDownButtonStyles.xaml" />
diff --git a/Source/NETworkManager/ProfileDialogManager.cs b/Source/NETworkManager/ProfileDialogManager.cs
index 1ee991a5e3..6b3793c104 100644
--- a/Source/NETworkManager/ProfileDialogManager.cs
+++ b/Source/NETworkManager/ProfileDialogManager.cs
@@ -1,4 +1,5 @@
 using MahApps.Metro.SimpleChildWindow;
+using NETworkManager.Controls;
 using NETworkManager.Localization.Resources;
 using NETworkManager.Models;
 using NETworkManager.Models.Network;
@@ -9,11 +10,9 @@
 using NETworkManager.Views;
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.Security;
 using System.Threading.Tasks;
 using System.Windows;
-using NETworkManager.Controls;
 
 namespace NETworkManager;
 
@@ -23,18 +22,13 @@ public static class ProfileDialogManager
 
     private static ProfileInfo ParseProfileInfo(ProfileViewModel instance)
     {
-        foreach (var tag in instance.TagsCollection)
-        {
-            Debug.WriteLine(tag);    
-        }
-        
         return new ProfileInfo
         {
             Name = instance.Name.Trim(),
             Host = instance.Host.Trim(),
             Description = instance.Description?.Trim(),
             Group = instance.Group.Trim(),
-            TagsCollection = new ObservableSetCollection<string> (instance.TagsCollection),
+            TagsCollection = new ObservableSetCollection<string>(instance.TagsCollection),
 
             // Network Interface
             NetworkInterface_Enabled = instance.NetworkInterface_Enabled,
diff --git a/Source/NETworkManager/Resources/Styles/ChildWindowStyles.xaml b/Source/NETworkManager/Resources/Styles/ChildWindowStyles.xaml
new file mode 100644
index 0000000000..fe902c9b8a
--- /dev/null
+++ b/Source/NETworkManager/Resources/Styles/ChildWindowStyles.xaml
@@ -0,0 +1,16 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:simpleChildWindow="clr-namespace:MahApps.Metro.SimpleChildWindow;assembly=MahApps.Metro.SimpleChildWindow">
+    <Style x:Key="DefaultChildWindow" TargetType="{x:Type simpleChildWindow:ChildWindow}">
+        <Setter Property="ShowTitleBar" Value="True" />        
+        <Setter Property="ShowCloseButton" Value="True" />
+        <Setter Property="CloseByEscape" Value="False" />
+        <Setter Property="AllowMove" Value="True" />
+        <Setter Property="TitleBarBackground" Value="Transparent" />
+        <Setter Property="TitleBarNonActiveBackground" Value="Transparent" />
+        <Setter Property="OverlayBrush" Value="{DynamicResource ResourceKey=MahApps.Brushes.Gray.SemiTransparent}" />
+        <Setter Property="TitleForeground" Value="{DynamicResource ResourceKey=MahApps.Brushes.Gray3}" />
+        <Setter Property="ChildWindowWidth" Value="450" />
+        <Setter Property="ChildWindowMaxHeight" Value="500" />
+    </Style>
+</ResourceDictionary>
diff --git a/Source/NETworkManager/Resources/Styles/ToolTipStyles.xaml b/Source/NETworkManager/Resources/Styles/ToolTipStyles.xaml
index e0e0fc6915..fc25c1508f 100644
--- a/Source/NETworkManager/Resources/Styles/ToolTipStyles.xaml
+++ b/Source/NETworkManager/Resources/Styles/ToolTipStyles.xaml
@@ -8,7 +8,7 @@
         <Setter Property="Background" Value="{DynamicResource  ResourceKey=MahApps.Brushes.Window.Background}" />
     </Style>
 
-    <Style TargetType="{x:Type TypeName=ToolTip}" BasedOn="{StaticResource  ResourceKey=DefaultToolTip}" />
+    <Style TargetType="{x:Type TypeName=ToolTip}" BasedOn="{StaticResource ResourceKey=DefaultToolTip}" />
 
     <Style x:Key="HelpToolTip" TargetType="{x:Type TypeName=ToolTip}" BasedOn="{StaticResource ResourceKey=DefaultToolTip}">
         <Setter Property="Template">
diff --git a/Source/NETworkManager/ViewModels/RemoteDesktopHostViewModel.cs b/Source/NETworkManager/ViewModels/RemoteDesktopHostViewModel.cs
index 5573aa979b..60e4dad0c8 100644
--- a/Source/NETworkManager/ViewModels/RemoteDesktopHostViewModel.cs
+++ b/Source/NETworkManager/ViewModels/RemoteDesktopHostViewModel.cs
@@ -1,5 +1,6 @@
 using Dragablz;
 using MahApps.Metro.Controls.Dialogs;
+using MahApps.Metro.SimpleChildWindow;
 using NETworkManager.Controls;
 using NETworkManager.Localization.Resources;
 using NETworkManager.Models;
@@ -517,16 +518,15 @@ private static void CloseItemAction(ItemActionCallbackArgs<TabablzControl> args)
     #region Methods
 
     // Connect via Dialog
-    private async Task Connect(string host = null)
+    private Task Connect(string host = null)
     {
-        var customDialog = new CustomDialog
-        {
-            Title = Strings.Connect
-        };
+        var childWindow = new RemoteDesktopConnectChildWindow(Application.Current.MainWindow);
 
-        var remoteDesktopConnectViewModel = new RemoteDesktopConnectViewModel(async instance =>
+        var childWindowViewModel = new RemoteDesktopConnectViewModel(instance =>
         {
-            await _dialogCoordinator.HideMetroDialogAsync(this, customDialog);
+            childWindow.IsOpen = false;
+            ConfigurationManager.Current.IsChildWindowOpen = false;
+
             ConfigurationManager.OnDialogClose();
 
             // Create new session info with default settings
@@ -560,22 +560,26 @@ private async Task Connect(string host = null)
             AddHostToHistory(instance.Host);
 
             Connect(sessionInfo);
-        }, async _ =>
+        }, _ =>
         {
-            await _dialogCoordinator.HideMetroDialogAsync(this, customDialog);
+            childWindow.IsOpen = false;
+            ConfigurationManager.Current.IsChildWindowOpen = false;
+
             ConfigurationManager.OnDialogClose();
         })
         {
             Host = host
         };
 
-        customDialog.Content = new RemoteDesktopConnectDialog
-        {
-            DataContext = remoteDesktopConnectViewModel
-        };
+        childWindow.Title = Strings.Connect;
+
+        childWindow.DataContext = childWindowViewModel;
+
+        ConfigurationManager.Current.IsChildWindowOpen = true;
 
         ConfigurationManager.OnDialogOpen();
-        await _dialogCoordinator.ShowMetroDialogAsync(this, customDialog);
+
+        return (Application.Current.MainWindow as MainWindow).ShowChildWindowAsync(childWindow);
     }
 
     // Connect via Profile
@@ -589,20 +593,19 @@ private void ConnectProfile()
     }
 
     // Connect via Profile with Credentials
-    private async Task ConnectProfileAs()
+    private Task ConnectProfileAs()
     {
         var profileInfo = SelectedProfile;
 
         var sessionInfo = RemoteDesktop.CreateSessionInfo(profileInfo);
 
-        var customDialog = new CustomDialog
-        {
-            Title = Strings.ConnectAs
-        };
+        var childWindow = new RemoteDesktopConnectChildWindow(Application.Current.MainWindow);
 
-        var remoteDesktopConnectViewModel = new RemoteDesktopConnectViewModel(async instance =>
+        var childWindowViewModel = new RemoteDesktopConnectViewModel(instance =>
         {
-            await _dialogCoordinator.HideMetroDialogAsync(this, customDialog);
+            childWindow.IsOpen = false;
+            ConfigurationManager.Current.IsChildWindowOpen = false;
+
             ConfigurationManager.OnDialogClose();
 
             if (instance.UseCredentials)
@@ -617,9 +620,11 @@ private async Task ConnectProfileAs()
             sessionInfo.AdminSession = instance.AdminSession;
 
             Connect(sessionInfo, instance.Name);
-        }, async _ =>
+        }, _ =>
         {
-            await _dialogCoordinator.HideMetroDialogAsync(this, customDialog);
+            childWindow.IsOpen = false;
+            ConfigurationManager.Current.IsChildWindowOpen = false;
+
             ConfigurationManager.OnDialogClose();
         },
         (
@@ -628,13 +633,15 @@ private async Task ConnectProfileAs()
             true
         ));
 
-        customDialog.Content = new RemoteDesktopConnectDialog
-        {
-            DataContext = remoteDesktopConnectViewModel
-        };
+        childWindow.Title = Strings.ConnectAs;
+
+        childWindow.DataContext = childWindowViewModel;
+
+        ConfigurationManager.Current.IsChildWindowOpen = true;
 
         ConfigurationManager.OnDialogOpen();
-        await _dialogCoordinator.ShowMetroDialogAsync(this, customDialog);
+
+        return (Application.Current.MainWindow as MainWindow).ShowChildWindowAsync(childWindow);
     }
 
     private void Connect(RemoteDesktopSessionInfo sessionInfo, string header = null)
diff --git a/Source/NETworkManager/Views/CredentialsPasswordProfileFileChildWindow.xaml b/Source/NETworkManager/Views/CredentialsPasswordProfileFileChildWindow.xaml
index 2b736cc6d5..1c12484350 100644
--- a/Source/NETworkManager/Views/CredentialsPasswordProfileFileChildWindow.xaml
+++ b/Source/NETworkManager/Views/CredentialsPasswordProfileFileChildWindow.xaml
@@ -10,18 +10,9 @@
              xmlns:localization="clr-namespace:NETworkManager.Localization.Resources;assembly=NETworkManager.Localization"
              xmlns:simpleChildWindow="clr-namespace:MahApps.Metro.SimpleChildWindow;assembly=MahApps.Metro.SimpleChildWindow"
              xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks"
-             ChildWindowWidth="450"
-             ChildWindowMaxHeight="500"
-             ShowTitleBar="True"
-             TitleBarBackground="Transparent"
-             TitleBarNonActiveBackground="Transparent"
-             ShowCloseButton="True"
              CloseButtonCommand="{Binding Path=CancelCommand}"
-             AllowMove="True"
-             TitleForeground="{DynamicResource ResourceKey=MahApps.Brushes.Gray3}"
-             CloseByEscape="False" 
-             OverlayBrush="{DynamicResource ResourceKey=MahApps.Brushes.Gray.SemiTransparent}"
-             Loaded="ChildWindow_OnLoaded"
+             Style="{StaticResource DefaultChildWindow}"
+             Loaded="ChildWindow_OnLoaded"                               
              mc:Ignorable="d" d:DataContext="{d:DesignInstance viewModels:CredentialsPasswordProfileFileViewModel}">
     <simpleChildWindow:ChildWindow.Resources>
         <converters:BooleanToVisibilityCollapsedConverter x:Key="BooleanToVisibilityCollapsedConverter" />
diff --git a/Source/NETworkManager/Views/ExportChildWindow.xaml b/Source/NETworkManager/Views/ExportChildWindow.xaml
index 896de4c21f..3842252671 100644
--- a/Source/NETworkManager/Views/ExportChildWindow.xaml
+++ b/Source/NETworkManager/Views/ExportChildWindow.xaml
@@ -12,17 +12,8 @@
              xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls"
              xmlns:validators="clr-namespace:NETworkManager.Validators;assembly=NETworkManager.Validators"
              xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks"
-             ChildWindowWidth="450"
-             ChildWindowMaxHeight="500"
-             ShowTitleBar="True"
-             TitleBarBackground="Transparent"
-             TitleBarNonActiveBackground="Transparent"
-             ShowCloseButton="True"
              CloseButtonCommand="{Binding Path=CancelCommand}"
-             AllowMove="True"
-             TitleForeground="{DynamicResource ResourceKey=MahApps.Brushes.Gray3}"
-             CloseByEscape="False" 
-             OverlayBrush="{DynamicResource ResourceKey=MahApps.Brushes.Gray.SemiTransparent}"             
+             Style="{StaticResource DefaultChildWindow}"
              mc:Ignorable="d" d:DataContext="{d:DesignInstance viewModels:ExportViewModel}">
     <simpleChildWindow:ChildWindow.Resources>
         <converters:BooleanToVisibilityCollapsedConverter x:Key="BooleanToVisibilityCollapsedConverter" />
diff --git a/Source/NETworkManager/Views/HostsFileEditorEntryChildWindow.xaml b/Source/NETworkManager/Views/HostsFileEditorEntryChildWindow.xaml
index 06366e7420..2bfe7c0996 100644
--- a/Source/NETworkManager/Views/HostsFileEditorEntryChildWindow.xaml
+++ b/Source/NETworkManager/Views/HostsFileEditorEntryChildWindow.xaml
@@ -12,17 +12,8 @@
              xmlns:localization="clr-namespace:NETworkManager.Localization.Resources;assembly=NETworkManager.Localization"
              xmlns:simpleChildWindow="clr-namespace:MahApps.Metro.SimpleChildWindow;assembly=MahApps.Metro.SimpleChildWindow"
              xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks"
-             ChildWindowWidth="450"
-             ChildWindowMaxHeight="500"
-             ShowTitleBar="True"
-             TitleBarBackground="Transparent"
-             TitleBarNonActiveBackground="Transparent"
-             ShowCloseButton="True"
              CloseButtonCommand="{Binding Path=CancelCommand}"
-             AllowMove="True"
-             TitleForeground="{DynamicResource ResourceKey=MahApps.Brushes.Gray3}"
-             CloseByEscape="False" 
-             OverlayBrush="{DynamicResource ResourceKey=MahApps.Brushes.Gray.SemiTransparent}"
+             Style="{StaticResource DefaultChildWindow}"
              Loaded="ChildWindow_OnLoaded"
              mc:Ignorable="d" d:DataContext="{d:DesignInstance viewModels:HostsFileEditorEntryViewModel}">
     <simpleChildWindow:ChildWindow.Resources>
diff --git a/Source/NETworkManager/Views/OKCancelInfoMessageChildWindow.xaml b/Source/NETworkManager/Views/OKCancelInfoMessageChildWindow.xaml
index 52fbde4a9e..9a0514cd2b 100644
--- a/Source/NETworkManager/Views/OKCancelInfoMessageChildWindow.xaml
+++ b/Source/NETworkManager/Views/OKCancelInfoMessageChildWindow.xaml
@@ -8,18 +8,8 @@
              xmlns:simpleChildWindow="clr-namespace:MahApps.Metro.SimpleChildWindow;assembly=MahApps.Metro.SimpleChildWindow"
              xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks"
              xmlns:converters="clr-namespace:NETworkManager.Converters;assembly=NETworkManager.Converters"
-             ChildWindowWidth="450"
-             ChildWindowMaxHeight="500"
-             ShowTitleBar="True"
-             TitleBarBackground="Transparent"
-             TitleBarNonActiveBackground="Transparent"
-             ShowCloseButton="True"
-             CloseButtonCommand="{Binding CancelCommand}"
-             AllowMove="True"
-             TitleForeground="{DynamicResource MahApps.Brushes.Gray3}"
-             CloseByEscape="False"                               
-             OverlayBrush="{DynamicResource ResourceKey=MahApps.Brushes.Gray.SemiTransparent}"         
              Loaded="ChildWindow_Loaded"
+             Style="{StaticResource DefaultChildWindow}"
              mc:Ignorable="d" d:DataContext="{d:DesignInstance viewModels:OKCancelInfoMessageViewModel}">
     <simpleChildWindow:ChildWindow.Resources>
         <converters:ChildWindowIconToRectangleStyleConverter x:Key="ChildWindowIconToRectangleStyleConverter" />
diff --git a/Source/NETworkManager/Views/OKMessageChildWindow.xaml b/Source/NETworkManager/Views/OKMessageChildWindow.xaml
index 869ff9d7b6..2193eddd6b 100644
--- a/Source/NETworkManager/Views/OKMessageChildWindow.xaml
+++ b/Source/NETworkManager/Views/OKMessageChildWindow.xaml
@@ -7,17 +7,9 @@
              xmlns:localization="clr-namespace:NETworkManager.Localization.Resources;assembly=NETworkManager.Localization"
              xmlns:simpleChildWindow="clr-namespace:MahApps.Metro.SimpleChildWindow;assembly=MahApps.Metro.SimpleChildWindow"
              xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks"
-             xmlns:converters="clr-namespace:NETworkManager.Converters;assembly=NETworkManager.Converters"
-             ChildWindowWidth="450"
-             ChildWindowMaxHeight="500"
-             ShowTitleBar="True"
-             TitleBarBackground="Transparent"
-             TitleBarNonActiveBackground="Transparent"             
-             AllowMove="True"
-             TitleForeground="{DynamicResource MahApps.Brushes.Gray3}"
-             CloseByEscape="False"                               
-             OverlayBrush="{DynamicResource ResourceKey=MahApps.Brushes.Gray.SemiTransparent}"      
+             xmlns:converters="clr-namespace:NETworkManager.Converters;assembly=NETworkManager.Converters"             
              Loaded="ChildWindow_Loaded"
+             Style="{StaticResource DefaultChildWindow}"
              mc:Ignorable="d" d:DataContext="{d:DesignInstance viewModels:OKMessageViewModel}">
     <simpleChildWindow:ChildWindow.Resources>
         <converters:ChildWindowIconToRectangleStyleConverter x:Key="ChildWindowIconToRectangleStyleConverter" />
diff --git a/Source/NETworkManager/Views/RemoteDesktopConnectDialog.xaml b/Source/NETworkManager/Views/RemoteDesktopConnectChildWindow.xaml
similarity index 68%
rename from Source/NETworkManager/Views/RemoteDesktopConnectDialog.xaml
rename to Source/NETworkManager/Views/RemoteDesktopConnectChildWindow.xaml
index 252b13bd9c..d1327261c0 100644
--- a/Source/NETworkManager/Views/RemoteDesktopConnectDialog.xaml
+++ b/Source/NETworkManager/Views/RemoteDesktopConnectChildWindow.xaml
@@ -1,22 +1,26 @@
-<UserControl x:Class="NETworkManager.Views.RemoteDesktopConnectDialog"
-             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:wpfHelpers="clr-namespace:NETworkManager.Utilities.WPF;assembly=NETworkManager.Utilities.WPF"
-             xmlns:converters="clr-namespace:NETworkManager.Converters;assembly=NETworkManager.Converters"
-             xmlns:interactivity="http://schemas.microsoft.com/xaml/behaviors"
-             xmlns:viewModels="clr-namespace:NETworkManager.ViewModels"
-             xmlns:localization="clr-namespace:NETworkManager.Localization.Resources;assembly=NETworkManager.Localization"
-             mc:Ignorable="d" Loaded="UserControl_Loaded"
-             d:DataContext="{d:DesignInstance viewModels:RemoteDesktopConnectViewModel}">
-    <UserControl.Resources>
+<simpleChildWindow:ChildWindow x:Class="NETworkManager.Views.RemoteDesktopConnectChildWindow"
+                               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:wpfHelpers="clr-namespace:NETworkManager.Utilities.WPF;assembly=NETworkManager.Utilities.WPF"
+                               xmlns:interactivity="http://schemas.microsoft.com/xaml/behaviors"
+                               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"
+                               xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks"                               
+                               CloseButtonCommand="{Binding Path=CancelCommand}"
+                               Style="{StaticResource DefaultChildWindow}"                               
+                               Loaded="ChildWindow_OnLoaded"
+                               mc:Ignorable="d" d:DataContext="{d:DesignInstance viewModels:ProfileViewModel}">
+    <simpleChildWindow:ChildWindow.Resources>
         <converters:BooleanToVisibilityCollapsedConverter x:Key="BooleanToVisibilityCollapsedConverter" />
         <converters:BooleanReverseConverter x:Key="BooleanReverseConverter" />
-    </UserControl.Resources>
-    <Grid Margin="0,20">
+    </simpleChildWindow:ChildWindow.Resources>
+    <Grid Margin="10">
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto" />
             <RowDefinition Height="Auto" />
@@ -42,13 +46,13 @@
                 <RowDefinition Height="Auto" />
             </Grid.RowDefinitions>
             <TextBlock Grid.Column="0" Grid.Row="0" Text="{x:Static localization:Strings.Name}"
-                       Visibility="{Binding ConnectAs, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}"
-                       Margin="0,0,0,10" />
+                 Visibility="{Binding ConnectAs, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}"
+                 Margin="0,0,0,10" />
             <TextBox x:Name="TextBoxName" Grid.Column="2" Grid.Row="0"
-                     mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExampleProfileName}"
-                     Visibility="{Binding ConnectAs, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}"
-                     IsEnabled="{Binding ConnectAs, Converter={StaticResource BooleanReverseConverter}}"
-                     Margin="0,0,0,10">
+               mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExampleProfileName}"
+               Visibility="{Binding ConnectAs, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}"
+               IsEnabled="{Binding ConnectAs, Converter={StaticResource BooleanReverseConverter}}"
+               Margin="0,0,0,10">
                 <TextBox.Text>
                     <Binding Path="Name" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged">
                         <Binding.ValidationRules>
@@ -59,9 +63,9 @@
             </TextBox>
             <TextBlock Grid.Column="0" Grid.Row="1" Text="{x:Static localization:Strings.Host}" />
             <ComboBox x:Name="ComboBoxHost" Grid.Column="2" Grid.Row="1" ItemsSource="{Binding HostHistoryView}"
-                      mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExampleHostWithRDPPort}"
-                      IsEnabled="{Binding ConnectAs, Converter={StaticResource BooleanReverseConverter}}"
-                      Style="{StaticResource EditableComboBox}">
+                mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExampleHostWithRDPPort}"
+                IsEnabled="{Binding ConnectAs, Converter={StaticResource BooleanReverseConverter}}"
+                Style="{StaticResource EditableComboBox}">
                 <ComboBox.Text>
                     <Binding Path="Host" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged">
                         <Binding.ValidationRules>
@@ -73,11 +77,11 @@
             </ComboBox>
             <TextBlock Grid.Column="0" Grid.Row="3" Text="{x:Static localization:Strings.UseCredentials}" />
             <mah:ToggleSwitch Grid.Column="2" Grid.Row="3" OffContent="" OnContent="" IsOn="{Binding UseCredentials}"
-                              IsEnabled="{Binding ConnectAs, Converter={StaticResource BooleanReverseConverter}}" />
+                        IsEnabled="{Binding ConnectAs, Converter={StaticResource BooleanReverseConverter}}" />
         </Grid>
         <Grid Grid.Row="1"
-              Visibility="{Binding UseCredentials, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}"
-              Margin="0,10,0,0">
+        Visibility="{Binding UseCredentials, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}"
+        Margin="0,10,0,0">
             <Grid.Resources>
                 <Style TargetType="{x:Type TextBlock}" BasedOn="{StaticResource CenterTextBlock}" />
                 <Style TargetType="{x:Type TextBox}" BasedOn="{StaticResource DefaultTextBox}" />
@@ -97,7 +101,7 @@
             </Grid.RowDefinitions>
             <TextBlock Grid.Column="0" Grid.Row="0" Text="{x:Static localization:Strings.Username}" />
             <TextBox x:Name="TextBoxUsername" Grid.Column="2" Grid.Row="0"
-                     mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExampleUsername}">
+               mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExampleUsername}">
                 <TextBox.Text>
                     <Binding Path="Username" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged">
                         <Binding.ValidationRules>
@@ -109,7 +113,7 @@
             </TextBox>
             <TextBlock Grid.Column="0" Grid.Row="2" Text="{x:Static localization:Strings.Domain}" />
             <TextBox x:Name="TextBoxDomain" Grid.Column="2" Grid.Row="2"
-                     mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExampleDomain}">
+               mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExampleDomain}">
                 <TextBox.Text>
                     <Binding Path="Domain" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged">
                         <Binding.ValidationRules>
@@ -120,11 +124,11 @@
             </TextBox>
             <TextBlock Grid.Column="0" Grid.Row="4" Text="{x:Static localization:Strings.Password}" />
             <PasswordBox x:Name="PasswordBoxPassword" Grid.Column="2" Grid.Row="4"
-                         mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExamplePassword}"
-                         Style="{StaticResource DefaultPasswordBox}">
+                   mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExamplePassword}"
+                   Style="{StaticResource DefaultPasswordBox}">
                 <interactivity:Interaction.Behaviors>
                     <wpfHelpers:PasswordBoxBindingBehavior
-                        Password="{Binding Password, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+                  Password="{Binding Password, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
                 </interactivity:Interaction.Behaviors>
             </PasswordBox>
         </Grid>
@@ -138,29 +142,29 @@
                 <ColumnDefinition Width="10" />
                 <ColumnDefinition Width="1*" />
             </Grid.ColumnDefinitions>
-            <Grid.RowDefinitions>                
+            <Grid.RowDefinitions>
                 <RowDefinition Height="Auto" />
-            </Grid.RowDefinitions>            
+            </Grid.RowDefinitions>
             <TextBlock Grid.Column="0" Grid.Row="0" Text="{x:Static localization:Strings.AdminConsoleSession}" />
             <mah:ToggleSwitch Grid.Column="2" Grid.Row="0" OffContent="" OnContent="" IsOn="{Binding AdminSession}" />
         </Grid>
         <StackPanel Grid.Row="5" Orientation="Horizontal" HorizontalAlignment="Right">
             <Button Content="{x:Static localization:Strings.Connect}" Command="{Binding ConnectCommand}"
-                    IsDefault="True" Margin="0,0,10,0">
+              IsDefault="True" Margin="0,0,10,0">
                 <Button.Style>
                     <Style TargetType="{x:Type Button}" BasedOn="{StaticResource HighlightedButton}">
                         <Setter Property="IsEnabled" Value="True" />
                         <Style.Triggers>
                             <DataTrigger Binding="{Binding Path=(Validation.HasError), ElementName=ComboBoxHost}"
-                                         Value="True">
+                                   Value="True">
                                 <Setter Property="IsEnabled" Value="False" />
                             </DataTrigger>
                             <MultiDataTrigger>
                                 <MultiDataTrigger.Conditions>
                                     <Condition Binding="{Binding UseCredentials}" Value="True" />
                                     <Condition
-                                        Binding="{Binding Path=(Validation.HasError), ElementName=TextBoxUsername}"
-                                        Value="True" />
+                                  Binding="{Binding Path=(Validation.HasError), ElementName=TextBoxUsername}"
+                                  Value="True" />
                                 </MultiDataTrigger.Conditions>
                                 <MultiDataTrigger.Setters>
                                     <Setter Property="IsEnabled" Value="False" />
@@ -170,8 +174,8 @@
                                 <MultiDataTrigger.Conditions>
                                     <Condition Binding="{Binding UseCredentials}" Value="True" />
                                     <Condition
-                                        Binding="{Binding Path=(Validation.HasError), ElementName=TextBoxDomain}"
-                                        Value="True" />
+                                  Binding="{Binding Path=(Validation.HasError), ElementName=TextBoxDomain}"
+                                  Value="True" />
                                 </MultiDataTrigger.Conditions>
                                 <MultiDataTrigger.Setters>
                                     <Setter Property="IsEnabled" Value="False" />
@@ -191,7 +195,7 @@
                 </Button.Style>
             </Button>
             <Button Content="{x:Static localization:Strings.Cancel}" Command="{Binding CancelCommand}" IsCancel="True"
-                    Style="{StaticResource DefaultButton}" />
+              Style="{StaticResource DefaultButton}" />
         </StackPanel>
     </Grid>
-</UserControl>
\ No newline at end of file
+</simpleChildWindow:ChildWindow>
\ No newline at end of file
diff --git a/Source/NETworkManager/Views/RemoteDesktopConnectChildWindow.xaml.cs b/Source/NETworkManager/Views/RemoteDesktopConnectChildWindow.xaml.cs
new file mode 100644
index 0000000000..0176125952
--- /dev/null
+++ b/Source/NETworkManager/Views/RemoteDesktopConnectChildWindow.xaml.cs
@@ -0,0 +1,21 @@
+using System;
+using System.Windows;
+using System.Windows.Threading;
+
+namespace NETworkManager.Views;
+
+public partial class RemoteDesktopConnectChildWindow
+{
+    public RemoteDesktopConnectChildWindow(Window parentWindow)
+    {
+        InitializeComponent();
+    }
+
+    private void ChildWindow_OnLoaded(object sender, RoutedEventArgs e)
+    {
+        Dispatcher.BeginInvoke(DispatcherPriority.ContextIdle, new Action(delegate
+        {
+            ComboBoxHost.Focus();
+        }));
+    }
+}
diff --git a/Source/NETworkManager/Views/RemoteDesktopConnectDialog.xaml.cs b/Source/NETworkManager/Views/RemoteDesktopConnectDialog.xaml.cs
deleted file mode 100644
index 6d005d7273..0000000000
--- a/Source/NETworkManager/Views/RemoteDesktopConnectDialog.xaml.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using System.Windows;
-
-namespace NETworkManager.Views;
-
-public partial class RemoteDesktopConnectDialog
-{
-    public RemoteDesktopConnectDialog()
-    {
-        InitializeComponent();
-    }
-
-    private void UserControl_Loaded(object sender, RoutedEventArgs e)
-    {
-        ComboBoxHost.Focus();
-    }
-}
\ No newline at end of file
diff --git a/Source/NETworkManager/Views/UpgradeChildWindow.xaml b/Source/NETworkManager/Views/UpgradeChildWindow.xaml
index 7de9e57e73..08eea116ab 100644
--- a/Source/NETworkManager/Views/UpgradeChildWindow.xaml
+++ b/Source/NETworkManager/Views/UpgradeChildWindow.xaml
@@ -8,12 +8,12 @@
              xmlns:resources="clr-namespace:NETworkManager.Properties"
              xmlns:localization="clr-namespace:NETworkManager.Localization.Resources;assembly=NETworkManager.Localization"
              xmlns:simpleChildWindow="clr-namespace:MahApps.Metro.SimpleChildWindow;assembly=MahApps.Metro.SimpleChildWindow"
-                               ShowTitleBar="False" 
-                               ChildWindowMaxWidth="650"
-                               ChildWindowMaxHeight="800"
-                               CloseByEscape="False"               
-                               Padding="20"
-                               OverlayBrush="{DynamicResource ResourceKey=MahApps.Brushes.Gray8}"
+             ShowTitleBar="False" 
+             ChildWindowMaxWidth="650"
+             ChildWindowMaxHeight="800"
+             CloseByEscape="False"               
+             Padding="20"
+             OverlayBrush="{DynamicResource ResourceKey=MahApps.Brushes.Gray8}"
              Loaded="ChildWindow_Loaded"
              mc:Ignorable="d" d:DataContext="{d:DesignInstance viewModels:UpgradeViewModel}">
     <Grid Margin="10">
diff --git a/Source/NETworkManager/Views/WelcomeChildWindow.xaml b/Source/NETworkManager/Views/WelcomeChildWindow.xaml
index 08ba86459a..c1edab2131 100644
--- a/Source/NETworkManager/Views/WelcomeChildWindow.xaml
+++ b/Source/NETworkManager/Views/WelcomeChildWindow.xaml
@@ -9,13 +9,13 @@
              xmlns:resources="clr-namespace:NETworkManager.Properties"
              xmlns:localization="clr-namespace:NETworkManager.Localization.Resources;assembly=NETworkManager.Localization"
              xmlns:simpleChildWindow="clr-namespace:MahApps.Metro.SimpleChildWindow;assembly=MahApps.Metro.SimpleChildWindow"
-                               ShowTitleBar="False" 
-                               ChildWindowMaxWidth="650"
-                               ChildWindowMaxHeight="800"
-                               CloseByEscape="False"               
-                               Padding="20"
-                               OverlayBrush="{DynamicResource MahApps.Brushes.Gray8}"
-                               Loaded="ChildWindow_Loaded"
+             ShowTitleBar="False" 
+             ChildWindowMaxWidth="650"
+             ChildWindowMaxHeight="800"
+             CloseByEscape="False"               
+             Padding="20"
+             OverlayBrush="{DynamicResource MahApps.Brushes.Gray8}"
+             Loaded="ChildWindow_Loaded"
              mc:Ignorable="d" d:DataContext="{d:DesignInstance viewModels:WelcomeViewModel}">
     <Grid Margin="10">
         <Grid.RowDefinitions>

From 5741d30406b850034076a77a86ddb5997c12b019 Mon Sep 17 00:00:00 2001
From: BornToBeRoot <16019165+BornToBeRoot@users.noreply.github.com>
Date: Sun, 26 Oct 2025 23:38:43 +0100
Subject: [PATCH 4/5] Feature: RDP admin session

---
 Source/NETworkManager.Profiles/GroupInfo.cs   |  15 +-
 Source/NETworkManager.Profiles/ProfileInfo.cs |   3 +
 Source/NETworkManager/ProfileDialogManager.cs |   2 +
 .../ViewModels/GroupViewModel.cs              |  38 +++--
 .../ViewModels/ProfileViewModel.cs            |  18 +-
 .../ViewModels/RemoteDesktopHostViewModel.cs  |  11 +-
 .../Views/GroupChildWindow.xaml               | 149 ++++++++---------
 .../Views/ProfileChildWindow.xaml             | 156 +++++++++---------
 Website/docs/changelog/next-release.md        |   5 +-
 9 files changed, 220 insertions(+), 177 deletions(-)

diff --git a/Source/NETworkManager.Profiles/GroupInfo.cs b/Source/NETworkManager.Profiles/GroupInfo.cs
index 1a5bafca31..a688e341d5 100644
--- a/Source/NETworkManager.Profiles/GroupInfo.cs
+++ b/Source/NETworkManager.Profiles/GroupInfo.cs
@@ -1,11 +1,11 @@
-using System.Collections.Generic;
-using System.Security;
-using System.Xml.Serialization;
-using NETworkManager.Models.Network;
+using NETworkManager.Models.Network;
 using NETworkManager.Models.PowerShell;
 using NETworkManager.Models.PuTTY;
 using NETworkManager.Models.RemoteDesktop;
 using NETworkManager.Settings;
+using System.Collections.Generic;
+using System.Security;
+using System.Xml.Serialization;
 
 namespace NETworkManager.Profiles;
 
@@ -37,7 +37,7 @@ public GroupInfo(GroupInfo group) : this(group.Name)
     {
         // General
         Description = group.Description;
-        
+
         // Profiles
         Profiles = group.Profiles;
 
@@ -46,6 +46,7 @@ public GroupInfo(GroupInfo group) : this(group.Name)
         RemoteDesktop_Username = group.RemoteDesktop_Username;
         RemoteDesktop_Domain = group.RemoteDesktop_Domain;
         RemoteDesktop_Password = group.RemoteDesktop_Password;
+        RemoteDesktop_AdminSession = group.RemoteDesktop_AdminSession;
         RemoteDesktop_OverrideDisplay = group.RemoteDesktop_OverrideDisplay;
         RemoteDesktop_AdjustScreenAutomatically = group.RemoteDesktop_AdjustScreenAutomatically;
         RemoteDesktop_UseCurrentViewSize = group.RemoteDesktop_UseCurrentViewSize;
@@ -168,7 +169,7 @@ public GroupInfo(GroupInfo group) : this(group.Name)
     ///     Name of the group.
     /// </summary>
     public string Name { get; set; }
-    
+
     /// <summary>
     ///    Description of the group.
     /// </summary>
@@ -183,6 +184,8 @@ public GroupInfo(GroupInfo group) : this(group.Name)
     public string RemoteDesktop_Domain { get; set; }
 
     [XmlIgnore] public SecureString RemoteDesktop_Password { get; set; }
+
+    public bool RemoteDesktop_AdminSession { get; set; }
     public bool RemoteDesktop_OverrideDisplay { get; set; }
     public bool RemoteDesktop_AdjustScreenAutomatically { get; set; }
 
diff --git a/Source/NETworkManager.Profiles/ProfileInfo.cs b/Source/NETworkManager.Profiles/ProfileInfo.cs
index ee2d83c69f..3cb7f8c0b5 100644
--- a/Source/NETworkManager.Profiles/ProfileInfo.cs
+++ b/Source/NETworkManager.Profiles/ProfileInfo.cs
@@ -82,6 +82,7 @@ public ProfileInfo(ProfileInfo profile)
         RemoteDesktop_Username = profile.RemoteDesktop_Username;
         RemoteDesktop_Domain = profile.RemoteDesktop_Domain;
         RemoteDesktop_Password = profile.RemoteDesktop_Password;
+        RemoteDesktop_AdminSession = profile.RemoteDesktop_AdminSession;
         RemoteDesktop_OverrideDisplay = profile.RemoteDesktop_OverrideDisplay;
         RemoteDesktop_AdjustScreenAutomatically = profile.RemoteDesktop_AdjustScreenAutomatically;
         RemoteDesktop_UseCurrentViewSize = profile.RemoteDesktop_UseCurrentViewSize;
@@ -314,6 +315,8 @@ public ProfileInfo(ProfileInfo profile)
     public string RemoteDesktop_Domain { get; set; }
 
     [XmlIgnore] public SecureString RemoteDesktop_Password { get; set; }
+
+    public bool RemoteDesktop_AdminSession { get; set; }
     public bool RemoteDesktop_OverrideDisplay { get; set; }
     public bool RemoteDesktop_AdjustScreenAutomatically { get; set; }
 
diff --git a/Source/NETworkManager/ProfileDialogManager.cs b/Source/NETworkManager/ProfileDialogManager.cs
index 6b3793c104..5766dc423b 100644
--- a/Source/NETworkManager/ProfileDialogManager.cs
+++ b/Source/NETworkManager/ProfileDialogManager.cs
@@ -91,6 +91,7 @@ private static ProfileInfo ParseProfileInfo(ProfileViewModel instance)
             RemoteDesktop_Password = instance.RemoteDesktop_UseCredentials
                 ? instance.RemoteDesktop_Password
                 : new SecureString(), // Remove sensitive info on disable
+            RemoteDesktop_AdminSession = instance.RemoteDesktop_AdminSession,
             RemoteDesktop_OverrideDisplay = instance.RemoteDesktop_OverrideDisplay,
             RemoteDesktop_AdjustScreenAutomatically = instance.RemoteDesktop_AdjustScreenAutomatically,
             RemoteDesktop_UseCurrentViewSize = instance.RemoteDesktop_UseCurrentViewSize,
@@ -317,6 +318,7 @@ private static GroupInfo ParseGroupInfo(GroupViewModel instance)
             RemoteDesktop_Password = instance.RemoteDesktop_UseCredentials
                 ? instance.RemoteDesktop_Password
                 : new SecureString(), // Remove sensitive info on disable
+            RemoteDesktop_AdminSession = instance.RemoteDesktop_AdminSession,
             RemoteDesktop_OverrideDisplay = instance.RemoteDesktop_OverrideDisplay,
             RemoteDesktop_AdjustScreenAutomatically = instance.RemoteDesktop_AdjustScreenAutomatically,
             RemoteDesktop_UseCurrentViewSize = instance.RemoteDesktop_UseCurrentViewSize,
diff --git a/Source/NETworkManager/ViewModels/GroupViewModel.cs b/Source/NETworkManager/ViewModels/GroupViewModel.cs
index 9b7abb62ee..930761c1cc 100644
--- a/Source/NETworkManager/ViewModels/GroupViewModel.cs
+++ b/Source/NETworkManager/ViewModels/GroupViewModel.cs
@@ -1,16 +1,16 @@
-using System;
+using NETworkManager.Models.Network;
+using NETworkManager.Models.PowerShell;
+using NETworkManager.Models.PuTTY;
+using NETworkManager.Models.RemoteDesktop;
+using NETworkManager.Profiles;
+using NETworkManager.Utilities;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
 using System.Security;
 using System.Windows.Data;
 using System.Windows.Input;
-using NETworkManager.Models.Network;
-using NETworkManager.Models.PowerShell;
-using NETworkManager.Models.PuTTY;
-using NETworkManager.Models.RemoteDesktop;
-using NETworkManager.Profiles;
-using NETworkManager.Utilities;
 
 // ReSharper disable InconsistentNaming
 
@@ -166,6 +166,21 @@ public SecureString RemoteDesktop_Password
         }
     }
 
+    private bool _remoteDesktop_AdminSession;
+
+    public bool RemoteDesktop_AdminSession
+    {
+        get => _remoteDesktop_AdminSession;
+        set
+        {
+            if (value == _remoteDesktop_AdminSession)
+                return;
+
+            _remoteDesktop_AdminSession = value;
+            OnPropertyChanged();
+        }
+    }
+
     private bool _remoteDesktop_OverrideDisplay;
 
     public bool RemoteDesktop_OverrideDisplay
@@ -1793,6 +1808,7 @@ public GroupViewModel(Action<GroupViewModel> saveCommand, Action<GroupViewModel>
         RemoteDesktop_Username = groupInfo.RemoteDesktop_Username;
         RemoteDesktop_Domain = groupInfo.RemoteDesktop_Domain;
         RemoteDesktop_Password = groupInfo.RemoteDesktop_Password;
+        RemoteDesktop_AdminSession = groupInfo.RemoteDesktop_AdminSession;
         RemoteDesktop_OverrideDisplay = groupInfo.RemoteDesktop_OverrideDisplay;
         RemoteDesktop_AdjustScreenAutomatically = groupInfo.RemoteDesktop_AdjustScreenAutomatically;
         RemoteDesktop_UseCurrentViewSize = groupInfo.RemoteDesktop_UseCurrentViewSize;
@@ -1900,18 +1916,16 @@ public GroupViewModel(Action<GroupViewModel> saveCommand, Action<GroupViewModel>
         // SNMP
         SNMP_OverrideOIDAndMode = groupInfo.SNMP_OverrideOIDAndMode;
         SNMP_OID = groupInfo.SNMP_OID;
-        SNMP_Modes = new List<SNMPMode> { SNMPMode.Get, SNMPMode.Walk, SNMPMode.Set };
+        SNMP_Modes = [SNMPMode.Get, SNMPMode.Walk, SNMPMode.Set];
         SNMP_Mode = SNMP_Modes.FirstOrDefault(x => x == groupInfo.SNMP_Mode);
         SNMP_OverrideVersionAndAuth = groupInfo.SNMP_OverrideVersionAndAuth;
         SNMP_Versions = Enum.GetValues(typeof(SNMPVersion)).Cast<SNMPVersion>().ToList();
         SNMP_Version = SNMP_Versions.FirstOrDefault(x => x == groupInfo.SNMP_Version);
         SNMP_Community = groupInfo.SNMP_Community;
-        SNMP_Securities = new List<SNMPV3Security>
-            { SNMPV3Security.NoAuthNoPriv, SNMPV3Security.AuthNoPriv, SNMPV3Security.AuthPriv };
+        SNMP_Securities = [SNMPV3Security.NoAuthNoPriv, SNMPV3Security.AuthNoPriv, SNMPV3Security.AuthPriv];
         SNMP_Security = SNMP_Securities.FirstOrDefault(x => x == groupInfo.SNMP_Security);
         SNMP_Username = groupInfo.SNMP_Username;
-        SNMP_AuthenticationProviders = Enum.GetValues(typeof(SNMPV3AuthenticationProvider))
-            .Cast<SNMPV3AuthenticationProvider>().ToList();
+        SNMP_AuthenticationProviders = [.. Enum.GetValues(typeof(SNMPV3AuthenticationProvider)).Cast<SNMPV3AuthenticationProvider>()];
         SNMP_AuthenticationProvider =
             SNMP_AuthenticationProviders.FirstOrDefault(x => x == groupInfo.SNMP_AuthenticationProvider);
         SNMP_Auth = groupInfo.SNMP_Auth;
diff --git a/Source/NETworkManager/ViewModels/ProfileViewModel.cs b/Source/NETworkManager/ViewModels/ProfileViewModel.cs
index 8550ab320e..a28e0e1bde 100644
--- a/Source/NETworkManager/ViewModels/ProfileViewModel.cs
+++ b/Source/NETworkManager/ViewModels/ProfileViewModel.cs
@@ -57,7 +57,7 @@ public ProfileViewModel(Action<ProfileViewModel> saveCommand, Action<ProfileView
         Groups.SortDescriptions.Add(new SortDescription());
 
         TagsCollection = new ObservableSetCollection<string>(profileInfo.TagsCollection);
-        
+
         Tags = CollectionViewSource.GetDefaultView(TagsCollection);
         Tags.SortDescriptions.Add(new SortDescription("", ListSortDirection.Ascending));
 
@@ -121,6 +121,7 @@ public ProfileViewModel(Action<ProfileViewModel> saveCommand, Action<ProfileView
         RemoteDesktop_Username = profileInfo.RemoteDesktop_Username;
         RemoteDesktop_Domain = profileInfo.RemoteDesktop_Domain;
         RemoteDesktop_Password = profileInfo.RemoteDesktop_Password;
+        RemoteDesktop_AdminSession = profileInfo.RemoteDesktop_AdminSession;
         RemoteDesktop_OverrideDisplay = profileInfo.RemoteDesktop_OverrideDisplay;
         RemoteDesktop_AdjustScreenAutomatically = profileInfo.RemoteDesktop_AdjustScreenAutomatically;
         RemoteDesktop_UseCurrentViewSize = profileInfo.RemoteDesktop_UseCurrentViewSize;
@@ -1076,6 +1077,21 @@ public SecureString RemoteDesktop_Password
         }
     }
 
+    private bool _remoteDesktop_AdminSession;
+
+    public bool RemoteDesktop_AdminSession
+    {
+        get => _remoteDesktop_AdminSession;
+        set
+        {
+            if (value == _remoteDesktop_AdminSession)
+                return;
+
+            _remoteDesktop_AdminSession = value;
+            OnPropertyChanged();
+        }
+    }
+
     private bool _remoteDesktop_OverrideDisplay;
 
     public bool RemoteDesktop_OverrideDisplay
diff --git a/Source/NETworkManager/ViewModels/RemoteDesktopHostViewModel.cs b/Source/NETworkManager/ViewModels/RemoteDesktopHostViewModel.cs
index 60e4dad0c8..b56f761f2c 100644
--- a/Source/NETworkManager/ViewModels/RemoteDesktopHostViewModel.cs
+++ b/Source/NETworkManager/ViewModels/RemoteDesktopHostViewModel.cs
@@ -408,7 +408,14 @@ private void ConnectProfileAsAction()
 
     private void ConnectProfileExternalAction()
     {
-        Process.Start("mstsc.exe", $"/V:{SelectedProfile.RemoteDesktop_Host}");
+        var args = new List<string>();
+
+        if (SelectedProfile.RemoteDesktop_AdminSession)
+            args.Add("/admin");
+
+        args.Add($"/V:{SelectedProfile.RemoteDesktop_Host}");
+
+        Process.Start("mstsc.exe", args);
     }
 
     public ICommand AddProfileCommand => new RelayCommand(_ => AddProfileAction());
@@ -630,7 +637,7 @@ private Task ConnectProfileAs()
         (
             profileInfo.Name,
             profileInfo.RemoteDesktop_Host,
-            true
+            profileInfo.RemoteDesktop_AdminSession
         ));
 
         childWindow.Title = Strings.ConnectAs;
diff --git a/Source/NETworkManager/Views/GroupChildWindow.xaml b/Source/NETworkManager/Views/GroupChildWindow.xaml
index 3383ef72d5..9796410451 100644
--- a/Source/NETworkManager/Views/GroupChildWindow.xaml
+++ b/Source/NETworkManager/Views/GroupChildWindow.xaml
@@ -19,15 +19,8 @@
              xmlns:profiles="clr-namespace:NETworkManager.Profiles;assembly=NETworkManager.Profiles"
              xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks"
              xmlns:simpleChildWindow="clr-namespace:MahApps.Metro.SimpleChildWindow;assembly=MahApps.Metro.SimpleChildWindow"
-             ShowTitleBar="True"
-             TitleBarBackground="Transparent"
-             TitleBarNonActiveBackground="Transparent"
-             ShowCloseButton="True"
              CloseButtonCommand="{Binding CancelCommand}"
-             AllowMove="True"
-             TitleForeground="{DynamicResource MahApps.Brushes.Gray3}"
-             CloseByEscape="False"             
-             OverlayBrush="{DynamicResource ResourceKey=MahApps.Brushes.Gray.SemiTransparent}"
+             Style="{StaticResource DefaultChildWindow}"
              Loaded="ChildWindow_OnLoaded"
              mc:Ignorable="d" d:DataContext="{d:DesignInstance viewModels:GroupViewModel}">
     <simpleChildWindow:ChildWindow.Resources>
@@ -755,6 +748,8 @@
                                     <RowDefinition Height="Auto" />
                                     <RowDefinition Height="10" />
                                     <RowDefinition Height="Auto" />
+                                    <RowDefinition Height="10" />
+                                    <RowDefinition Height="Auto" />
                                 </Grid.RowDefinitions>
                                 <Grid.ColumnDefinitions>
                                     <ColumnDefinition Width="1*" />
@@ -826,16 +821,18 @@
                                         <Style TargetType="{x:Type ToolTip}" BasedOn="{StaticResource HelpToolTip}" />
                                     </Rectangle.Resources>
                                 </Rectangle>
-                                <TextBlock Grid.Column="0" Grid.Row="8" Grid.ColumnSpan="4"
+                                <TextBlock Grid.Column="0" Grid.Row="8" Text="{x:Static localization:Strings.AdminConsoleSession}" />
+                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="8" OffContent="" OnContent="" IsOn="{Binding RemoteDesktop_AdminSession}" />
+                                <TextBlock Grid.Column="0" Grid.Row="10" Grid.ColumnSpan="4"
                                            Text="{x:Static localization:Strings.OverrideDefaultSettings}"
                                            Style="{StaticResource HeaderTextBlock}" Margin="0,10,0,0" />
-                                <Separator Grid.Column="0" Grid.Row="10" Grid.ColumnSpan="4"
+                                <Separator Grid.Column="0" Grid.Row="12" Grid.ColumnSpan="4"
                                            Background="{DynamicResource MahApps.Brushes.Gray8}" Margin="0,0,0,10" />
-                                <CheckBox Grid.Column="0" Grid.Row="12" VerticalAlignment="Top"
+                                <CheckBox Grid.Column="0" Grid.Row="14" VerticalAlignment="Top"
                                           Content="{x:Static localization:Strings.Display}"
                                           IsChecked="{Binding RemoteDesktop_OverrideDisplay}"
                                           Style="{StaticResource DefaultCheckBox}" />
-                                <StackPanel Grid.Column="2" Grid.Row="12"
+                                <StackPanel Grid.Column="2" Grid.Row="14"
                                             IsEnabled="{Binding RemoteDesktop_OverrideDisplay}">
                                     <RadioButton x:Name="RadioButtonAdjustScreenAutomatically"
                                                  Content="{x:Static localization:Strings.AdjustScreenAutomatically}"
@@ -907,18 +904,18 @@
                                         </Grid>
                                     </GroupBox>
                                 </StackPanel>
-                                <CheckBox Grid.Column="0" Grid.Row="14"
+                                <CheckBox Grid.Column="0" Grid.Row="16"
                                           Content="{x:Static localization:Strings.ColorDepthBit}"
                                           IsChecked="{Binding RemoteDesktop_OverrideColorDepth}"
                                           Style="{StaticResource DefaultCheckBox}" />
-                                <ComboBox Grid.Column="2" Grid.Row="14"
+                                <ComboBox Grid.Column="2" Grid.Row="16"
                                           ItemsSource="{Binding RemoteDesktop_ColorDepths}"
                                           SelectedItem="{Binding RemoteDesktop_SelectedColorDepth}"
                                           IsEnabled="{Binding RemoteDesktop_OverrideColorDepth}" />
-                                <CheckBox Grid.Column="0" Grid.Row="16" Content="{x:Static localization:Strings.Port}"
+                                <CheckBox Grid.Column="0" Grid.Row="18" Content="{x:Static localization:Strings.Port}"
                                           IsChecked="{Binding RemoteDesktop_OverridePort}"
                                           Style="{StaticResource DefaultCheckBox}" />
-                                <TextBox Grid.Column="2" Grid.Row="16" x:Name="TextBoxRemoteDesktopPort"
+                                <TextBox Grid.Column="2" Grid.Row="18" x:Name="TextBoxRemoteDesktopPort"
                                          mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExamplePort3389}"
                                          IsEnabled="{Binding RemoteDesktop_OverridePort}"
                                          Style="{StaticResource DefaultTextBox}">
@@ -932,40 +929,40 @@
                                         </Binding>
                                     </TextBox.Text>
                                 </TextBox>
-                                <CheckBox Grid.Column="0" Grid.Row="18"
+                                <CheckBox Grid.Column="0" Grid.Row="20"
                                           Content="{x:Static localization:Strings.CredentialSecuritySupportProvider}"
                                           IsChecked="{Binding RemoteDesktop_OverrideCredSspSupport}"
                                           Style="{StaticResource DefaultCheckBox}" />
-                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="18" OffContent="" OnContent=""
+                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="20" OffContent="" OnContent=""
                                                   IsOn="{Binding RemoteDesktop_EnableCredSspSupport}"
                                                   IsEnabled="{Binding RemoteDesktop_OverrideCredSspSupport}" />
                                 <CheckBox Grid.Column="0" Grid.Row="20"
                                           Content="{x:Static localization:Strings.AuthenticationLevel}"
                                           IsChecked="{Binding RemoteDesktop_OverrideAuthenticationLevel}"
                                           Style="{StaticResource DefaultCheckBox}" />
-                                <mah:NumericUpDown Grid.Column="2" Grid.Row="20"
+                                <mah:NumericUpDown Grid.Column="2" Grid.Row="22"
                                                    Value="{Binding RemoteDesktop_AuthenticationLevel}" Maximum="3"
                                                    Minimum="0" Interval="1"
                                                    IsEnabled="{Binding RemoteDesktop_OverrideAuthenticationLevel}" />
-                                <Rectangle Grid.Column="3" Grid.Row="20" Width="24" Height="24"
+                                <Rectangle Grid.Column="3" Grid.Row="22" Width="24" Height="24"
                                            ToolTip="{x:Static localization:Strings.HelpMessage_RDPAuthenticationLevel}"
                                            Style="{StaticResource HelpImageRectangle}" Margin="10,0,0,0">
                                     <Rectangle.Resources>
                                         <Style TargetType="{x:Type ToolTip}" BasedOn="{StaticResource HelpToolTip}" />
                                     </Rectangle.Resources>
                                 </Rectangle>
-                                <CheckBox Grid.Column="0" Grid.Row="22"
+                                <CheckBox Grid.Column="0" Grid.Row="24"
                                           Content="{x:Static localization:Strings.EnableGatewayServer}"
                                           IsChecked="{Binding RemoteDesktop_OverrideGatewayServer}"
                                           Style="{StaticResource DefaultCheckBox}" />
-                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="22" OffContent="" OnContent=""
+                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="24" OffContent="" OnContent=""
                                                   IsOn="{Binding RemoteDesktop_EnableGatewayServer}"
                                                   IsEnabled="{Binding RemoteDesktop_OverrideGatewayServer}" />
-                                <TextBlock Grid.Column="0" Grid.Row="24"
+                                <TextBlock Grid.Column="0" Grid.Row="26"
                                            Text="{x:Static localization:Strings.ServerName}" Margin="24,0,0,0"
                                            VerticalAlignment="Center" Style="{StaticResource DisabledTextBlock}" />
-                                <TextBox x:Name="TextBoxRemoteDesktopGatewayServerHostname" Grid.Column="2"
-                                         Grid.Row="24"
+                                <TextBox x:Name="TextBoxRemoteDesktopGatewayServerHostname" 
+                                         Grid.Column="2" Grid.Row="26"
                                          mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExampleGatewayDomain}">
                                     <TextBox.Style>
                                         <Style TargetType="{x:Type TextBox}" BasedOn="{StaticResource DefaultTextBox}">
@@ -998,11 +995,11 @@
                                         </Binding>
                                     </TextBox.Text>
                                 </TextBox>
-                                <TextBlock Grid.Column="0" Grid.Row="26"
+                                <TextBlock Grid.Column="0" Grid.Row="28"
                                            Text="{x:Static localization:Strings.BypassForLocalAddresses}"
                                            Margin="24,0,0,0" VerticalAlignment="Center"
                                            Style="{StaticResource DisabledTextBlock}" />
-                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="26" Content="" OnContent=""
+                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="28" Content="" OnContent=""
                                                   IsOn="{Binding RemoteDesktop_GatewayServerBypassLocalAddresses}">
                                     <mah:ToggleSwitch.Style>
                                         <Style TargetType="{x:Type mah:ToggleSwitch}"
@@ -1026,10 +1023,10 @@
                                         </Style>
                                     </mah:ToggleSwitch.Style>
                                 </mah:ToggleSwitch>
-                                <TextBlock Grid.Column="0" Grid.Row="28"
+                                <TextBlock Grid.Column="0" Grid.Row="30"
                                            Text="{x:Static localization:Strings.LogonMethod}" Margin="24,0,0,0"
                                            VerticalAlignment="Center" Style="{StaticResource DisabledTextBlock}" />
-                                <ComboBox Grid.Column="2" Grid.Row="28"
+                                <ComboBox Grid.Column="2" Grid.Row="30"
                                           ItemsSource="{Binding RemoteDesktop_GatewayServerLogonMethods}"
                                           SelectedItem="{Binding RemoteDesktop_GatewayServerLogonMethod}">
                                     <ComboBox.Style>
@@ -1061,11 +1058,11 @@
                                         </DataTemplate>
                                     </ComboBox.ItemTemplate>
                                 </ComboBox>
-                                <TextBlock Grid.Column="0" Grid.Row="30"
+                                <TextBlock Grid.Column="0" Grid.Row="32"
                                            Text="{x:Static localization:Strings.ShareGatewayCredentialsWithRemoteComputer}"
                                            Margin="24,0,0,0" VerticalAlignment="Center"
                                            Style="{StaticResource DisabledTextBlock}" />
-                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="30" Content="" OnContent=""
+                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="32" Content="" OnContent=""
                                                   IsOn="{Binding RemoteDesktop_GatewayServerShareCredentialsWithRemoteComputer}">
                                     <mah:ToggleSwitch.Style>
                                         <Style TargetType="{x:Type mah:ToggleSwitch}"
@@ -1089,11 +1086,11 @@
                                         </Style>
                                     </mah:ToggleSwitch.Style>
                                 </mah:ToggleSwitch>
-                                <TextBlock Grid.Column="0" Grid.Row="32"
+                                <TextBlock Grid.Column="0" Grid.Row="34"
                                            Text="{x:Static localization:Strings.UseGatewayCredentials}"
                                            Margin="24,0,0,0" VerticalAlignment="Center"
                                            Style="{StaticResource DisabledTextBlock}" />
-                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="32" Content="" OnContent=""
+                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="34" Content="" OnContent=""
                                                   IsOn="{Binding RemoteDesktop_UseGatewayServerCredentials}">
                                     <mah:ToggleSwitch.Style>
                                         <Style TargetType="{x:Type mah:ToggleSwitch}"
@@ -1120,10 +1117,10 @@
                                         </Style>
                                     </mah:ToggleSwitch.Style>
                                 </mah:ToggleSwitch>
-                                <TextBlock Grid.Column="0" Grid.Row="34"
+                                <TextBlock Grid.Column="0" Grid.Row="36"
                                            Text="{x:Static localization:Strings.Username}" Margin="24,0,0,0"
                                            VerticalAlignment="Center" Style="{StaticResource DisabledTextBlock}" />
-                                <TextBox Grid.Column="2" Grid.Row="34"
+                                <TextBox Grid.Column="2" Grid.Row="36"
                                          x:Name="TextBoxRemoteDesktopGatewayServerUsername"
                                          mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExampleUsername}">
                                     <TextBox.Style>
@@ -1159,10 +1156,10 @@
                                         </Binding>
                                     </TextBox.Text>
                                 </TextBox>
-                                <TextBlock Grid.Column="0" Grid.Row="36" Text="{x:Static localization:Strings.Domain}"
+                                <TextBlock Grid.Column="0" Grid.Row="38" Text="{x:Static localization:Strings.Domain}"
                                            Margin="24,0,0,0" VerticalAlignment="Center"
                                            Style="{StaticResource DisabledTextBlock}" />
-                                <TextBox Grid.Column="2" Grid.Row="36" x:Name="TextBoxRemoteDesktopGatewayServerDomain"
+                                <TextBox Grid.Column="2" Grid.Row="38" x:Name="TextBoxRemoteDesktopGatewayServerDomain"
                                          mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExampleDomain}">
                                     <TextBox.Style>
                                         <Style TargetType="{x:Type TextBox}" BasedOn="{StaticResource DefaultTextBox}">
@@ -1197,10 +1194,10 @@
                                         </Binding>
                                     </TextBox.Text>
                                 </TextBox>
-                                <TextBlock Grid.Column="0" Grid.Row="38"
+                                <TextBlock Grid.Column="0" Grid.Row="40"
                                            Text="{x:Static localization:Strings.Password}" Margin="24,0,0,0"
                                            VerticalAlignment="Center" Style="{StaticResource DisabledTextBlock}" />
-                                <PasswordBox Grid.Column="2" Grid.Row="38"
+                                <PasswordBox Grid.Column="2" Grid.Row="40"
                                              x:Name="PasswordBoxRemoteDesktopGatewayServerPassword">
                                     <PasswordBox.Style>
                                         <Style TargetType="{x:Type PasswordBox}"
@@ -1239,7 +1236,7 @@
                                             Password="{Binding RemoteDesktop_GatewayServerPassword, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
                                     </interactivity:Interaction.Behaviors>
                                 </PasswordBox>
-                                <Rectangle Width="24" Height="24" Grid.Column="3" Grid.Row="38"
+                                <Rectangle Width="24" Height="24" Grid.Column="3" Grid.Row="40"
                                            ToolTip="{x:Static localization:Strings.WarningMessage_ProfileFileNotEncryptedStoringPasswords}"
                                            Visibility="{Binding IsProfileFileEncrypted, Converter={StaticResource BooleanReverseToVisibilityCollapsedConverter}}"
                                            Style="{StaticResource WarnImageRectangle}" Margin="10,0,0,0">
@@ -1247,11 +1244,11 @@
                                         <Style TargetType="{x:Type ToolTip}" BasedOn="{StaticResource HelpToolTip}" />
                                     </Rectangle.Resources>
                                 </Rectangle>
-                                <CheckBox Grid.Column="0" Grid.Row="40"
+                                <CheckBox Grid.Column="0" Grid.Row="42"
                                           Content="{x:Static localization:Strings.RemoteAudioPlayback}"
                                           IsChecked="{Binding RemoteDesktop_OverrideAudioRedirectionMode}"
                                           Style="{StaticResource DefaultCheckBox}" />
-                                <ComboBox Grid.Column="2" Grid.Row="40"
+                                <ComboBox Grid.Column="2" Grid.Row="42"
                                           ItemsSource="{Binding RemoteDesktop_AudioRedirectionModes}"
                                           SelectedItem="{Binding RemoteDesktop_AudioRedirectionMode}"
                                           IsEnabled="{Binding RemoteDesktop_OverrideAudioRedirectionMode}">
@@ -1263,11 +1260,11 @@
                                         </DataTemplate>
                                     </ComboBox.ItemTemplate>
                                 </ComboBox>
-                                <CheckBox Grid.Column="0" Grid.Row="42"
+                                <CheckBox Grid.Column="0" Grid.Row="44"
                                           Content="{x:Static localization:Strings.RemoteAudioRecording}"
                                           IsChecked="{Binding RemoteDesktop_OverrideAudioCaptureRedirectionMode}"
                                           Style="{StaticResource DefaultCheckBox}" />
-                                <ComboBox Grid.Column="2" Grid.Row="42"
+                                <ComboBox Grid.Column="2" Grid.Row="44"
                                           ItemsSource="{Binding RemoteDesktop_AudioCaptureRedirectionModes}"
                                           SelectedItem="{Binding RemoteDesktop_AudioCaptureRedirectionMode}"
                                           IsEnabled="{Binding RemoteDesktop_OverrideAudioCaptureRedirectionMode}">
@@ -1279,11 +1276,11 @@
                                         </DataTemplate>
                                     </ComboBox.ItemTemplate>
                                 </ComboBox>
-                                <CheckBox Grid.Column="0" Grid.Row="44"
+                                <CheckBox Grid.Column="0" Grid.Row="46"
                                           Content="{x:Static localization:Strings.ApplyWindowsKeyCombinations}"
                                           IsChecked="{Binding RemoteDesktop_OverrideApplyWindowsKeyCombinations}"
                                           Style="{StaticResource DefaultCheckBox}" />
-                                <ComboBox Grid.Column="2" Grid.Row="44"
+                                <ComboBox Grid.Column="2" Grid.Row="46"
                                           ItemsSource="{Binding RemoteDesktop_KeyboardHookModes}"
                                           SelectedItem="{Binding RemoteDesktop_KeyboardHookMode}"
                                           IsEnabled="{Binding RemoteDesktop_OverrideApplyWindowsKeyCombinations}">
@@ -1295,67 +1292,67 @@
                                         </DataTemplate>
                                     </ComboBox.ItemTemplate>
                                 </ComboBox>
-                                <CheckBox Grid.Column="0" Grid.Row="46"
+                                <CheckBox Grid.Column="0" Grid.Row="48"
                                           Content="{x:Static localization:Strings.RedirectClipboard}"
                                           IsChecked="{Binding RemoteDesktop_OverrideRedirectClipboard}"
                                           Style="{StaticResource DefaultCheckBox}" />
-                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="46" OffContent="" OnContent=""
+                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="48" OffContent="" OnContent=""
                                                   IsOn="{Binding RemoteDesktop_RedirectClipboard}"
                                                   IsEnabled="{Binding RemoteDesktop_OverrideRedirectClipboard}" />
-                                <CheckBox Grid.Column="0" Grid.Row="48"
+                                <CheckBox Grid.Column="0" Grid.Row="50"
                                           Content="{x:Static localization:Strings.RedirectDevices}"
                                           IsChecked="{Binding RemoteDesktop_OverrideRedirectDevices}"
                                           Style="{StaticResource DefaultCheckBox}" />
-                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="48" OffContent="" OnContent=""
+                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="50" OffContent="" OnContent=""
                                                   IsOn="{Binding RemoteDesktop_RedirectDevices}"
                                                   IsEnabled="{Binding RemoteDesktop_OverrideRedirectDevices}" />
-                                <CheckBox Grid.Column="0" Grid.Row="50"
+                                <CheckBox Grid.Column="0" Grid.Row="52"
                                           Content="{x:Static localization:Strings.RedirectDrives}"
                                           IsChecked="{Binding RemoteDesktop_OverrideRedirectDrives}"
                                           Style="{StaticResource DefaultCheckBox}" />
-                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="50" OffContent="" OnContent=""
+                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="52" OffContent="" OnContent=""
                                                   IsOn="{Binding RemoteDesktop_RedirectDrives}"
                                                   IsEnabled="{Binding RemoteDesktop_OverrideRedirectDrives}" />
-                                <CheckBox Grid.Column="0" Grid.Row="52"
+                                <CheckBox Grid.Column="0" Grid.Row="54"
                                           Content="{x:Static localization:Strings.RedirectPorts}"
                                           IsChecked="{Binding RemoteDesktop_OverrideRedirectPorts}"
                                           Style="{StaticResource DefaultCheckBox}" />
-                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="52" OffContent="" OnContent=""
+                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="54" OffContent="" OnContent=""
                                                   IsOn="{Binding RemoteDesktop_RedirectPorts}"
                                                   IsEnabled="{Binding RemoteDesktop_OverrideRedirectPorts}" />
-                                <CheckBox Grid.Column="0" Grid.Row="54"
+                                <CheckBox Grid.Column="0" Grid.Row="56"
                                           Content="{x:Static localization:Strings.RedirectSmartcards}"
                                           IsChecked="{Binding RemoteDesktop_OverrideRedirectSmartcards}"
                                           Style="{StaticResource DefaultCheckBox}" />
-                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="54" OffContent="" OnContent=""
+                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="56" OffContent="" OnContent=""
                                                   IsOn="{Binding RemoteDesktop_RedirectSmartCards}"
                                                   IsEnabled="{Binding RemoteDesktop_OverrideRedirectSmartcards}" />
-                                <CheckBox Grid.Column="0" Grid.Row="56"
+                                <CheckBox Grid.Column="0" Grid.Row="58"
                                           Content="{x:Static localization:Strings.RedirectPrinters}"
                                           IsChecked="{Binding RemoteDesktop_OverrideRedirectPrinters}"
                                           Style="{StaticResource DefaultCheckBox}" />
-                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="56" OffContent="" OnContent=""
+                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="58" OffContent="" OnContent=""
                                                   IsOn="{Binding RemoteDesktop_RedirectPrinters}"
                                                   IsEnabled="{Binding RemoteDesktop_OverrideRedirectPrinters}" />
-                                <CheckBox Grid.Column="0" Grid.Row="58"
+                                <CheckBox Grid.Column="0" Grid.Row="60"
                                           Content="{x:Static localization:Strings.PersistentBitmapCaching}"
                                           IsChecked="{Binding RemoteDesktop_OverridePersistentBitmapCaching}"
                                           Style="{StaticResource DefaultCheckBox}" />
-                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="58" OffContent="" OnContent=""
+                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="60" OffContent="" OnContent=""
                                                   IsOn="{Binding RemoteDesktop_PersistentBitmapCaching}"
                                                   IsEnabled="{Binding RemoteDesktop_OverridePersistentBitmapCaching}" />
-                                <CheckBox Grid.Column="0" Grid.Row="60"
+                                <CheckBox Grid.Column="0" Grid.Row="62"
                                           Content="{x:Static localization:Strings.ReconnectIfTheConnectionIsDropped}"
                                           IsChecked="{Binding RemoteDesktop_OverrideReconnectIfTheConnectionIsDropped}"
                                           Style="{StaticResource DefaultCheckBox}" />
-                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="60" OffContent="" OnContent=""
+                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="62" OffContent="" OnContent=""
                                                   IsOn="{Binding RemoteDesktop_ReconnectIfTheConnectionIsDropped}"
                                                   IsEnabled="{Binding RemoteDesktop_OverrideReconnectIfTheConnectionIsDropped}" />
-                                <CheckBox Grid.Column="0" Grid.Row="62"
+                                <CheckBox Grid.Column="0" Grid.Row="64"
                                           Content="{x:Static localization:Strings.NetworkConnectionType}"
                                           IsChecked="{Binding RemoteDesktop_OverrideNetworkConnectionType}"
                                           Style="{StaticResource DefaultCheckBox}" />
-                                <ComboBox Grid.Column="2" Grid.Row="62"
+                                <ComboBox Grid.Column="2" Grid.Row="64"
                                           ItemsSource="{Binding RemoteDesktop_NetworkConnectionTypes}"
                                           SelectedItem="{Binding RemoteDesktop_NetworkConnectionType}"
                                           IsEnabled="{Binding RemoteDesktop_OverrideNetworkConnectionType}">
@@ -1367,42 +1364,42 @@
                                         </DataTemplate>
                                     </ComboBox.ItemTemplate>
                                 </ComboBox>
-                                <TextBlock Grid.Column="0" Grid.Row="64"
+                                <TextBlock Grid.Column="0" Grid.Row="66"
                                            Text="{x:Static localization:Strings.DesktopBackground}" Margin="24,0,0,0"
                                            VerticalAlignment="Center" Style="{StaticResource DisabledTextBlock}" />
-                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="64" OffContent="" OnContent=""
+                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="66" OffContent="" OnContent=""
                                                   IsOn="{Binding RemoteDesktop_DesktopBackground}"
                                                   IsEnabled="{Binding RemoteDesktop_OverrideNetworkConnectionType}" />
-                                <TextBlock Grid.Column="0" Grid.Row="66"
+                                <TextBlock Grid.Column="0" Grid.Row="68"
                                            Text="{x:Static localization:Strings.FontSmoothing}" Margin="24,0,0,0"
                                            VerticalAlignment="Center" Style="{StaticResource DisabledTextBlock}" />
-                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="66" OffContent="" OnContent=""
+                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="68" OffContent="" OnContent=""
                                                   IsOn="{Binding RemoteDesktop_FontSmoothing}"
                                                   IsEnabled="{Binding RemoteDesktop_OverrideNetworkConnectionType}" />
-                                <TextBlock Grid.Column="0" Grid.Row="68"
+                                <TextBlock Grid.Column="0" Grid.Row="70"
                                            Text="{x:Static localization:Strings.DesktopComposition}" Margin="24,0,0,0"
                                            VerticalAlignment="Center" Style="{StaticResource DisabledTextBlock}" />
-                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="68" OffContent="" OnContent=""
+                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="70" OffContent="" OnContent=""
                                                   IsOn="{Binding RemoteDesktop_DesktopComposition}"
                                                   IsEnabled="{Binding RemoteDesktop_OverrideNetworkConnectionType}" />
-                                <TextBlock Grid.Column="0" Grid.Row="70"
+                                <TextBlock Grid.Column="0" Grid.Row="72"
                                            Text="{x:Static localization:Strings.ShowWindowContentsWhileDragging}"
                                            Margin="24,0,0,0" VerticalAlignment="Center"
                                            Style="{StaticResource DisabledTextBlock}" />
-                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="70" OffContent="" OnContent=""
+                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="72" OffContent="" OnContent=""
                                                   IsOn="{Binding RemoteDesktop_ShowWindowContentsWhileDragging}"
                                                   IsEnabled="{Binding RemoteDesktop_OverrideNetworkConnectionType}" />
-                                <TextBlock Grid.Column="0" Grid.Row="72"
+                                <TextBlock Grid.Column="0" Grid.Row="74"
                                            Text="{x:Static localization:Strings.MenuAndWindowAnimation}"
                                            Margin="24,0,0,0" VerticalAlignment="Center"
                                            Style="{StaticResource DisabledTextBlock}" />
-                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="72" OffContent="" OnContent=""
+                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="74" OffContent="" OnContent=""
                                                   IsOn="{Binding RemoteDesktop_MenuAndWindowAnimation}"
                                                   IsEnabled="{Binding RemoteDesktop_OverrideNetworkConnectionType}" />
-                                <TextBlock Grid.Column="0" Grid.Row="74"
+                                <TextBlock Grid.Column="0" Grid.Row="76"
                                            Text="{x:Static localization:Strings.VisualStyles}" Margin="24,0,0,0"
                                            VerticalAlignment="Center" Style="{StaticResource DisabledTextBlock}" />
-                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="74" OffContent="" OnContent=""
+                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="76" OffContent="" OnContent=""
                                                   IsOn="{Binding RemoteDesktop_VisualStyles}"
                                                   IsEnabled="{Binding RemoteDesktop_OverrideNetworkConnectionType}" />
                             </Grid>
diff --git a/Source/NETworkManager/Views/ProfileChildWindow.xaml b/Source/NETworkManager/Views/ProfileChildWindow.xaml
index fc3744969a..b9ce92ddf1 100644
--- a/Source/NETworkManager/Views/ProfileChildWindow.xaml
+++ b/Source/NETworkManager/Views/ProfileChildWindow.xaml
@@ -18,16 +18,9 @@
                                xmlns:localization="clr-namespace:NETworkManager.Localization.Resources;assembly=NETworkManager.Localization"
                                xmlns:profiles="clr-namespace:NETworkManager.Profiles;assembly=NETworkManager.Profiles"
                                xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks"
-                               xmlns:simpleChildWindow="clr-namespace:MahApps.Metro.SimpleChildWindow;assembly=MahApps.Metro.SimpleChildWindow"
-                               ShowTitleBar="True"
-                               TitleBarBackground="Transparent"
-                               TitleBarNonActiveBackground="Transparent"
-                               ShowCloseButton="True"
+                               xmlns:simpleChildWindow="clr-namespace:MahApps.Metro.SimpleChildWindow;assembly=MahApps.Metro.SimpleChildWindow"                               
                                CloseButtonCommand="{Binding CancelCommand}"
-                               AllowMove="True"
-                               TitleForeground="{DynamicResource MahApps.Brushes.Gray3}"
-                               CloseByEscape="False"
-                               OverlayBrush="{DynamicResource ResourceKey=MahApps.Brushes.Gray.SemiTransparent}"
+                               Style="{StaticResource DefaultChildWindow}"
                                Loaded="ChildWindow_OnLoaded"
                                mc:Ignorable="d" d:DataContext="{d:DesignInstance viewModels:ProfileViewModel}">
     <simpleChildWindow:ChildWindow.Resources>
@@ -91,7 +84,7 @@
                                                         Binding="{Binding Path=IsMouseOver,RelativeSource={RelativeSource AncestorType={x:Type ListBoxItem}}}"
                                                         Value="True">
                                                         <Setter Property="Fill"
-                                                                Value="{DynamicResource MahApps.Brushes.Graygs5}" />
+                                                                Value="{DynamicResource MahApps.Brushes.Gray5}" />
                                                     </DataTrigger>
                                                     <DataTrigger
                                                         Binding="{Binding Path=IsSelected,RelativeSource={RelativeSource AncestorType={x:Type ListBoxItem}}}"
@@ -2047,6 +2040,8 @@
                                     <RowDefinition Height="Auto" />
                                     <RowDefinition Height="10" />
                                     <RowDefinition Height="Auto" />
+                                    <RowDefinition Height="10" />
+                                    <RowDefinition Height="Auto" />
                                 </Grid.RowDefinitions>
                                 <Grid.ColumnDefinitions>
                                     <ColumnDefinition Width="1*" />
@@ -2158,16 +2153,18 @@
                                         <Style TargetType="{x:Type ToolTip}" BasedOn="{StaticResource HelpToolTip}" />
                                     </Rectangle.Resources>
                                 </Rectangle>
-                                <TextBlock Grid.Column="0" Grid.Row="12" Grid.ColumnSpan="4"
+                                <TextBlock Grid.Column="0" Grid.Row="12" Text="{x:Static localization:Strings.AdminConsoleSession}" />
+                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="12" OffContent="" OnContent="" IsOn="{Binding RemoteDesktop_AdminSession}" />
+                                <TextBlock Grid.Column="0" Grid.Row="14" Grid.ColumnSpan="4"
                                            Text="{x:Static localization:Strings.OverrideDefaultSettings}"
                                            Style="{StaticResource HeaderTextBlock}" Margin="0,10,0,0" />
-                                <Separator Grid.Column="0" Grid.Row="14" Grid.ColumnSpan="4"
+                                <Separator Grid.Column="0" Grid.Row="16" Grid.ColumnSpan="4"
                                            Background="{DynamicResource MahApps.Brushes.Gray8}" Margin="0,0,0,10" />
-                                <CheckBox Grid.Column="0" Grid.Row="16" VerticalAlignment="Top"
+                                <CheckBox Grid.Column="0" Grid.Row="18" VerticalAlignment="Top"
                                           Content="{x:Static localization:Strings.Display}"
                                           IsChecked="{Binding RemoteDesktop_OverrideDisplay}"
                                           Style="{StaticResource DefaultCheckBox}" />
-                                <StackPanel Grid.Column="2" Grid.Row="16"
+                                <StackPanel Grid.Column="2" Grid.Row="18"
                                             IsEnabled="{Binding RemoteDesktop_OverrideDisplay}">
                                     <RadioButton x:Name="RadioButtonAdjustScreenAutomatically"
                                                  Content="{x:Static localization:Strings.AdjustScreenAutomatically}"
@@ -2241,18 +2238,18 @@
                                         </Grid>
                                     </GroupBox>
                                 </StackPanel>
-                                <CheckBox Grid.Column="0" Grid.Row="18"
+                                <CheckBox Grid.Column="0" Grid.Row="20"
                                           Content="{x:Static localization:Strings.ColorDepthBit}"
                                           IsChecked="{Binding RemoteDesktop_OverrideColorDepth}"
                                           Style="{StaticResource DefaultCheckBox}" />
-                                <ComboBox Grid.Column="2" Grid.Row="18"
+                                <ComboBox Grid.Column="2" Grid.Row="20"
                                           ItemsSource="{Binding RemoteDesktop_ColorDepths}"
                                           SelectedItem="{Binding RemoteDesktop_SelectedColorDepth}"
                                           IsEnabled="{Binding RemoteDesktop_OverrideColorDepth}" />
-                                <CheckBox Grid.Column="0" Grid.Row="20" Content="{x:Static localization:Strings.Port}"
+                                <CheckBox Grid.Column="0" Grid.Row="22" Content="{x:Static localization:Strings.Port}"
                                           IsChecked="{Binding RemoteDesktop_OverridePort}"
                                           Style="{StaticResource DefaultCheckBox}" />
-                                <TextBox Grid.Column="2" Grid.Row="20" x:Name="TextBoxRemoteDesktopPort"
+                                <TextBox Grid.Column="2" Grid.Row="22" x:Name="TextBoxRemoteDesktopPort"
                                          mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExamplePort3389}"
                                          IsEnabled="{Binding RemoteDesktop_OverridePort}"
                                          Style="{StaticResource DefaultTextBox}">
@@ -2266,40 +2263,41 @@
                                         </Binding>
                                     </TextBox.Text>
                                 </TextBox>
-                                <CheckBox Grid.Column="0" Grid.Row="22"
+                                <CheckBox Grid.Column="0" Grid.Row="24"
                                           Content="{x:Static localization:Strings.CredentialSecuritySupportProvider}"
                                           IsChecked="{Binding RemoteDesktop_OverrideCredSspSupport}"
                                           Style="{StaticResource DefaultCheckBox}" />
-                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="22" OffContent="" OnContent=""
+                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="24" OffContent="" OnContent=""
                                                   IsOn="{Binding RemoteDesktop_EnableCredSspSupport}"
                                                   IsEnabled="{Binding RemoteDesktop_OverrideCredSspSupport}" />
-                                <CheckBox Grid.Column="0" Grid.Row="24"
+                                <CheckBox Grid.Column="0" Grid.Row="26"
                                           Content="{x:Static localization:Strings.AuthenticationLevel}"
                                           IsChecked="{Binding RemoteDesktop_OverrideAuthenticationLevel}"
                                           Style="{StaticResource DefaultCheckBox}" />
-                                <mah:NumericUpDown Grid.Column="2" Grid.Row="24"
+                                <mah:NumericUpDown Grid.Column="2" Grid.Row="26"
                                                    Value="{Binding RemoteDesktop_AuthenticationLevel}" Maximum="3"
                                                    Minimum="0" Interval="1"
                                                    IsEnabled="{Binding RemoteDesktop_OverrideAuthenticationLevel}" />
-                                <Rectangle Grid.Column="3" Grid.Row="24" Width="24" Height="24"
+                                <Rectangle Grid.Column="3" Grid.Row="26" 
+                                           Width="24" Height="24"
                                            ToolTip="{x:Static localization:Strings.HelpMessage_RDPAuthenticationLevel}"
                                            Style="{StaticResource HelpImageRectangle}" Margin="10,0,0,0">
                                     <Rectangle.Resources>
                                         <Style TargetType="{x:Type ToolTip}" BasedOn="{StaticResource HelpToolTip}" />
                                     </Rectangle.Resources>
                                 </Rectangle>
-                                <CheckBox Grid.Column="0" Grid.Row="26"
+                                <CheckBox Grid.Column="0" Grid.Row="28"
                                           Content="{x:Static localization:Strings.EnableGatewayServer}"
                                           IsChecked="{Binding RemoteDesktop_OverrideGatewayServer}"
                                           Style="{StaticResource DefaultCheckBox}" />
-                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="26" OffContent="" OnContent=""
+                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="28" OffContent="" OnContent=""
                                                   IsOn="{Binding RemoteDesktop_EnableGatewayServer}"
                                                   IsEnabled="{Binding RemoteDesktop_OverrideGatewayServer}" />
-                                <TextBlock Grid.Column="0" Grid.Row="28"
+                                <TextBlock Grid.Column="0" Grid.Row="30"
                                            Text="{x:Static localization:Strings.ServerName}" Margin="24,0,0,0"
                                            VerticalAlignment="Center" Style="{StaticResource DisabledTextBlock}" />
-                                <TextBox x:Name="TextBoxRemoteDesktopGatewayServerHostname" Grid.Column="2"
-                                         Grid.Row="28"
+                                <TextBox x:Name="TextBoxRemoteDesktopGatewayServerHostname" 
+                                         Grid.Column="2" Grid.Row="30"
                                          mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExampleGatewayDomain}">
                                     <TextBox.Style>
                                         <Style TargetType="{x:Type TextBox}" BasedOn="{StaticResource DefaultTextBox}">
@@ -2332,11 +2330,11 @@
                                         </Binding>
                                     </TextBox.Text>
                                 </TextBox>
-                                <TextBlock Grid.Column="0" Grid.Row="30"
+                                <TextBlock Grid.Column="0" Grid.Row="32"
                                            Text="{x:Static localization:Strings.BypassForLocalAddresses}"
                                            Margin="24,0,0,0" VerticalAlignment="Center"
                                            Style="{StaticResource DisabledTextBlock}" />
-                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="30" Content="" OnContent=""
+                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="32" Content="" OnContent=""
                                                   IsOn="{Binding RemoteDesktop_GatewayServerBypassLocalAddresses}">
                                     <mah:ToggleSwitch.Style>
                                         <Style TargetType="{x:Type mah:ToggleSwitch}"
@@ -2360,10 +2358,10 @@
                                         </Style>
                                     </mah:ToggleSwitch.Style>
                                 </mah:ToggleSwitch>
-                                <TextBlock Grid.Column="0" Grid.Row="32"
+                                <TextBlock Grid.Column="0" Grid.Row="34"
                                            Text="{x:Static localization:Strings.LogonMethod}" Margin="24,0,0,0"
                                            VerticalAlignment="Center" Style="{StaticResource DisabledTextBlock}" />
-                                <ComboBox Grid.Column="2" Grid.Row="32"
+                                <ComboBox Grid.Column="2" Grid.Row="34"
                                           ItemsSource="{Binding RemoteDesktop_GatewayServerLogonMethods}"
                                           SelectedItem="{Binding RemoteDesktop_GatewayServerLogonMethod}">
                                     <ComboBox.Style>
@@ -2395,11 +2393,11 @@
                                         </DataTemplate>
                                     </ComboBox.ItemTemplate>
                                 </ComboBox>
-                                <TextBlock Grid.Column="0" Grid.Row="34"
+                                <TextBlock Grid.Column="0" Grid.Row="36"
                                            Text="{x:Static localization:Strings.ShareGatewayCredentialsWithRemoteComputer}"
                                            Margin="24,0,0,0" VerticalAlignment="Center"
                                            Style="{StaticResource DisabledTextBlock}" />
-                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="34" Content="" OnContent=""
+                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="36" Content="" OnContent=""
                                                   IsOn="{Binding RemoteDesktop_GatewayServerShareCredentialsWithRemoteComputer}">
                                     <mah:ToggleSwitch.Style>
                                         <Style TargetType="{x:Type mah:ToggleSwitch}"
@@ -2423,11 +2421,11 @@
                                         </Style>
                                     </mah:ToggleSwitch.Style>
                                 </mah:ToggleSwitch>
-                                <TextBlock Grid.Column="0" Grid.Row="36"
+                                <TextBlock Grid.Column="0" Grid.Row="38"
                                            Text="{x:Static localization:Strings.UseGatewayCredentials}"
                                            Margin="24,0,0,0" VerticalAlignment="Center"
                                            Style="{StaticResource DisabledTextBlock}" />
-                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="36" Content="" OnContent=""
+                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="38" Content="" OnContent=""
                                                   IsOn="{Binding RemoteDesktop_UseGatewayServerCredentials}">
                                     <mah:ToggleSwitch.Style>
                                         <Style TargetType="{x:Type mah:ToggleSwitch}"
@@ -2454,10 +2452,10 @@
                                         </Style>
                                     </mah:ToggleSwitch.Style>
                                 </mah:ToggleSwitch>
-                                <TextBlock Grid.Column="0" Grid.Row="38"
+                                <TextBlock Grid.Column="0" Grid.Row="40"
                                            Text="{x:Static localization:Strings.Username}" Margin="24,0,0,0"
                                            VerticalAlignment="Center" Style="{StaticResource DisabledTextBlock}" />
-                                <TextBox Grid.Column="2" Grid.Row="38"
+                                <TextBox Grid.Column="2" Grid.Row="40"
                                          x:Name="TextBoxRemoteDesktopGatewayServerUsername"
                                          mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExampleUsername}">
                                     <TextBox.Style>
@@ -2493,10 +2491,10 @@
                                         </Binding>
                                     </TextBox.Text>
                                 </TextBox>
-                                <TextBlock Grid.Column="0" Grid.Row="40" Text="{x:Static localization:Strings.Domain}"
+                                <TextBlock Grid.Column="0" Grid.Row="42" Text="{x:Static localization:Strings.Domain}"
                                            Margin="24,0,0,0" VerticalAlignment="Center"
                                            Style="{StaticResource DisabledTextBlock}" />
-                                <TextBox Grid.Column="2" Grid.Row="40" x:Name="TextBoxRemoteDesktopGatewayServerDomain"
+                                <TextBox Grid.Column="2" Grid.Row="42" x:Name="TextBoxRemoteDesktopGatewayServerDomain"
                                          mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExampleDomain}">
                                     <TextBox.Style>
                                         <Style TargetType="{x:Type TextBox}" BasedOn="{StaticResource DefaultTextBox}">
@@ -2531,10 +2529,10 @@
                                         </Binding>
                                     </TextBox.Text>
                                 </TextBox>
-                                <TextBlock Grid.Column="0" Grid.Row="42"
+                                <TextBlock Grid.Column="0" Grid.Row="44"
                                            Text="{x:Static localization:Strings.Password}" Margin="24,0,0,0"
                                            VerticalAlignment="Center" Style="{StaticResource DisabledTextBlock}" />
-                                <PasswordBox Grid.Column="2" Grid.Row="42"
+                                <PasswordBox Grid.Column="2" Grid.Row="44"
                                              x:Name="PasswordBoxRemoteDesktopGatewayServerPassword">
                                     <PasswordBox.Style>
                                         <Style TargetType="{x:Type PasswordBox}"
@@ -2573,7 +2571,7 @@
                                             Password="{Binding RemoteDesktop_GatewayServerPassword, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
                                     </interactivity:Interaction.Behaviors>
                                 </PasswordBox>
-                                <Rectangle Width="24" Height="24" Grid.Column="3" Grid.Row="42"
+                                <Rectangle Width="24" Height="24" Grid.Column="3" Grid.Row="44"
                                            ToolTip="{x:Static localization:Strings.WarningMessage_ProfileFileNotEncryptedStoringPasswords}"
                                            Visibility="{Binding IsProfileFileEncrypted, Converter={StaticResource BooleanReverseToVisibilityCollapsedConverter}}"
                                            Style="{StaticResource WarnImageRectangle}" Margin="10,0,0,0">
@@ -2581,11 +2579,11 @@
                                         <Style TargetType="{x:Type ToolTip}" BasedOn="{StaticResource HelpToolTip}" />
                                     </Rectangle.Resources>
                                 </Rectangle>
-                                <CheckBox Grid.Column="0" Grid.Row="44"
+                                <CheckBox Grid.Column="0" Grid.Row="46"
                                           Content="{x:Static localization:Strings.RemoteAudioPlayback}"
                                           IsChecked="{Binding RemoteDesktop_OverrideAudioRedirectionMode}"
                                           Style="{StaticResource DefaultCheckBox}" />
-                                <ComboBox Grid.Column="2" Grid.Row="44"
+                                <ComboBox Grid.Column="2" Grid.Row="46"
                                           ItemsSource="{Binding RemoteDesktop_AudioRedirectionModes}"
                                           SelectedItem="{Binding RemoteDesktop_AudioRedirectionMode}"
                                           IsEnabled="{Binding RemoteDesktop_OverrideAudioRedirectionMode}">
@@ -2597,11 +2595,11 @@
                                         </DataTemplate>
                                     </ComboBox.ItemTemplate>
                                 </ComboBox>
-                                <CheckBox Grid.Column="0" Grid.Row="46"
+                                <CheckBox Grid.Column="0" Grid.Row="48"
                                           Content="{x:Static localization:Strings.RemoteAudioRecording}"
                                           IsChecked="{Binding RemoteDesktop_OverrideAudioCaptureRedirectionMode}"
                                           Style="{StaticResource DefaultCheckBox}" />
-                                <ComboBox Grid.Column="2" Grid.Row="46"
+                                <ComboBox Grid.Column="2" Grid.Row="48"
                                           ItemsSource="{Binding RemoteDesktop_AudioCaptureRedirectionModes}"
                                           SelectedItem="{Binding RemoteDesktop_AudioCaptureRedirectionMode}"
                                           IsEnabled="{Binding RemoteDesktop_OverrideAudioCaptureRedirectionMode}">
@@ -2613,11 +2611,11 @@
                                         </DataTemplate>
                                     </ComboBox.ItemTemplate>
                                 </ComboBox>
-                                <CheckBox Grid.Column="0" Grid.Row="48"
+                                <CheckBox Grid.Column="0" Grid.Row="50"
                                           Content="{x:Static localization:Strings.ApplyWindowsKeyCombinations}"
                                           IsChecked="{Binding RemoteDesktop_OverrideApplyWindowsKeyCombinations}"
                                           Style="{StaticResource DefaultCheckBox}" />
-                                <ComboBox Grid.Column="2" Grid.Row="48"
+                                <ComboBox Grid.Column="2" Grid.Row="50"
                                           ItemsSource="{Binding RemoteDesktop_KeyboardHookModes}"
                                           SelectedItem="{Binding RemoteDesktop_KeyboardHookMode}"
                                           IsEnabled="{Binding RemoteDesktop_OverrideApplyWindowsKeyCombinations}">
@@ -2629,67 +2627,67 @@
                                         </DataTemplate>
                                     </ComboBox.ItemTemplate>
                                 </ComboBox>
-                                <CheckBox Grid.Column="0" Grid.Row="50"
+                                <CheckBox Grid.Column="0" Grid.Row="52"
                                           Content="{x:Static localization:Strings.RedirectClipboard}"
                                           IsChecked="{Binding RemoteDesktop_OverrideRedirectClipboard}"
                                           Style="{StaticResource DefaultCheckBox}" />
-                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="50" OffContent="" OnContent=""
+                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="52" OffContent="" OnContent=""
                                                   IsOn="{Binding RemoteDesktop_RedirectClipboard}"
                                                   IsEnabled="{Binding RemoteDesktop_OverrideRedirectClipboard}" />
-                                <CheckBox Grid.Column="0" Grid.Row="52"
+                                <CheckBox Grid.Column="0" Grid.Row="54"
                                           Content="{x:Static localization:Strings.RedirectDevices}"
                                           IsChecked="{Binding RemoteDesktop_OverrideRedirectDevices}"
                                           Style="{StaticResource DefaultCheckBox}" />
-                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="52" OffContent="" OnContent=""
+                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="54" OffContent="" OnContent=""
                                                   IsOn="{Binding RemoteDesktop_RedirectDevices}"
                                                   IsEnabled="{Binding RemoteDesktop_OverrideRedirectDevices}" />
-                                <CheckBox Grid.Column="0" Grid.Row="54"
+                                <CheckBox Grid.Column="0" Grid.Row="56"
                                           Content="{x:Static localization:Strings.RedirectDrives}"
                                           IsChecked="{Binding RemoteDesktop_OverrideRedirectDrives}"
                                           Style="{StaticResource DefaultCheckBox}" />
-                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="54" OffContent="" OnContent=""
+                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="56" OffContent="" OnContent=""
                                                   IsOn="{Binding RemoteDesktop_RedirectDrives}"
                                                   IsEnabled="{Binding RemoteDesktop_OverrideRedirectDrives}" />
-                                <CheckBox Grid.Column="0" Grid.Row="56"
+                                <CheckBox Grid.Column="0" Grid.Row="58"
                                           Content="{x:Static localization:Strings.RedirectPorts}"
                                           IsChecked="{Binding RemoteDesktop_OverrideRedirectPorts}"
                                           Style="{StaticResource DefaultCheckBox}" />
-                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="56" OffContent="" OnContent=""
+                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="58" OffContent="" OnContent=""
                                                   IsOn="{Binding RemoteDesktop_RedirectPorts}"
                                                   IsEnabled="{Binding RemoteDesktop_OverrideRedirectPorts}" />
-                                <CheckBox Grid.Column="0" Grid.Row="58"
+                                <CheckBox Grid.Column="0" Grid.Row="60"
                                           Content="{x:Static localization:Strings.RedirectSmartcards}"
                                           IsChecked="{Binding RemoteDesktop_OverrideRedirectSmartcards}"
                                           Style="{StaticResource DefaultCheckBox}" />
-                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="58" OffContent="" OnContent=""
+                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="60" OffContent="" OnContent=""
                                                   IsOn="{Binding RemoteDesktop_RedirectSmartCards}"
                                                   IsEnabled="{Binding RemoteDesktop_OverrideRedirectSmartcards}" />
-                                <CheckBox Grid.Column="0" Grid.Row="60"
+                                <CheckBox Grid.Column="0" Grid.Row="62"
                                           Content="{x:Static localization:Strings.RedirectPrinters}"
                                           IsChecked="{Binding RemoteDesktop_OverrideRedirectPrinters}"
                                           Style="{StaticResource DefaultCheckBox}" />
-                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="60" OffContent="" OnContent=""
+                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="62" OffContent="" OnContent=""
                                                   IsOn="{Binding RemoteDesktop_RedirectPrinters}"
                                                   IsEnabled="{Binding RemoteDesktop_OverrideRedirectPrinters}" />
-                                <CheckBox Grid.Column="0" Grid.Row="62"
+                                <CheckBox Grid.Column="0" Grid.Row="64"
                                           Content="{x:Static localization:Strings.PersistentBitmapCaching}"
                                           IsChecked="{Binding RemoteDesktop_OverridePersistentBitmapCaching}"
                                           Style="{StaticResource DefaultCheckBox}" />
-                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="62" OffContent="" OnContent=""
+                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="64" OffContent="" OnContent=""
                                                   IsOn="{Binding RemoteDesktop_PersistentBitmapCaching}"
                                                   IsEnabled="{Binding RemoteDesktop_OverridePersistentBitmapCaching}" />
-                                <CheckBox Grid.Column="0" Grid.Row="64"
+                                <CheckBox Grid.Column="0" Grid.Row="66"
                                           Content="{x:Static localization:Strings.ReconnectIfTheConnectionIsDropped}"
                                           IsChecked="{Binding RemoteDesktop_OverrideReconnectIfTheConnectionIsDropped}"
                                           Style="{StaticResource DefaultCheckBox}" />
-                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="64" OffContent="" OnContent=""
+                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="66" OffContent="" OnContent=""
                                                   IsOn="{Binding RemoteDesktop_ReconnectIfTheConnectionIsDropped}"
                                                   IsEnabled="{Binding RemoteDesktop_OverrideReconnectIfTheConnectionIsDropped}" />
-                                <CheckBox Grid.Column="0" Grid.Row="66"
+                                <CheckBox Grid.Column="0" Grid.Row="68"
                                           Content="{x:Static localization:Strings.NetworkConnectionType}"
                                           IsChecked="{Binding RemoteDesktop_OverrideNetworkConnectionType}"
                                           Style="{StaticResource DefaultCheckBox}" />
-                                <ComboBox Grid.Column="2" Grid.Row="66"
+                                <ComboBox Grid.Column="2" Grid.Row="68"
                                           ItemsSource="{Binding RemoteDesktop_NetworkConnectionTypes}"
                                           SelectedItem="{Binding RemoteDesktop_NetworkConnectionType}"
                                           IsEnabled="{Binding RemoteDesktop_OverrideNetworkConnectionType}">
@@ -2701,42 +2699,42 @@
                                         </DataTemplate>
                                     </ComboBox.ItemTemplate>
                                 </ComboBox>
-                                <TextBlock Grid.Column="0" Grid.Row="68"
+                                <TextBlock Grid.Column="0" Grid.Row="70"
                                            Text="{x:Static localization:Strings.DesktopBackground}" Margin="24,0,0,0"
                                            VerticalAlignment="Center" Style="{StaticResource DisabledTextBlock}" />
-                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="68" OffContent="" OnContent=""
+                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="70" OffContent="" OnContent=""
                                                   IsOn="{Binding RemoteDesktop_DesktopBackground}"
                                                   IsEnabled="{Binding RemoteDesktop_OverrideNetworkConnectionType}" />
-                                <TextBlock Grid.Column="0" Grid.Row="70"
+                                <TextBlock Grid.Column="0" Grid.Row="72"
                                            Text="{x:Static localization:Strings.FontSmoothing}" Margin="24,0,0,0"
                                            VerticalAlignment="Center" Style="{StaticResource DisabledTextBlock}" />
-                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="70" OffContent="" OnContent=""
+                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="72" OffContent="" OnContent=""
                                                   IsOn="{Binding RemoteDesktop_FontSmoothing}"
                                                   IsEnabled="{Binding RemoteDesktop_OverrideNetworkConnectionType}" />
-                                <TextBlock Grid.Column="0" Grid.Row="72"
+                                <TextBlock Grid.Column="0" Grid.Row="74"
                                            Text="{x:Static localization:Strings.DesktopComposition}" Margin="24,0,0,0"
                                            VerticalAlignment="Center" Style="{StaticResource DisabledTextBlock}" />
-                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="72" OffContent="" OnContent=""
+                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="74" OffContent="" OnContent=""
                                                   IsOn="{Binding RemoteDesktop_DesktopComposition}"
                                                   IsEnabled="{Binding RemoteDesktop_OverrideNetworkConnectionType}" />
-                                <TextBlock Grid.Column="0" Grid.Row="74"
+                                <TextBlock Grid.Column="0" Grid.Row="76"
                                            Text="{x:Static localization:Strings.ShowWindowContentsWhileDragging}"
                                            Margin="24,0,0,0" VerticalAlignment="Center"
                                            Style="{StaticResource DisabledTextBlock}" />
-                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="74" OffContent="" OnContent=""
+                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="76" OffContent="" OnContent=""
                                                   IsOn="{Binding RemoteDesktop_ShowWindowContentsWhileDragging}"
                                                   IsEnabled="{Binding RemoteDesktop_OverrideNetworkConnectionType}" />
-                                <TextBlock Grid.Column="0" Grid.Row="76"
+                                <TextBlock Grid.Column="0" Grid.Row="78"
                                            Text="{x:Static localization:Strings.MenuAndWindowAnimation}"
                                            Margin="24,0,0,0" VerticalAlignment="Center"
                                            Style="{StaticResource DisabledTextBlock}" />
-                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="76" OffContent="" OnContent=""
+                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="78" OffContent="" OnContent=""
                                                   IsOn="{Binding RemoteDesktop_MenuAndWindowAnimation}"
                                                   IsEnabled="{Binding RemoteDesktop_OverrideNetworkConnectionType}" />
-                                <TextBlock Grid.Column="0" Grid.Row="78"
+                                <TextBlock Grid.Column="0" Grid.Row="80"
                                            Text="{x:Static localization:Strings.VisualStyles}" Margin="24,0,0,0"
                                            VerticalAlignment="Center" Style="{StaticResource DisabledTextBlock}" />
-                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="78" OffContent="" OnContent=""
+                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="80" OffContent="" OnContent=""
                                                   IsOn="{Binding RemoteDesktop_VisualStyles}"
                                                   IsEnabled="{Binding RemoteDesktop_OverrideNetworkConnectionType}" />
                             </Grid>
diff --git a/Website/docs/changelog/next-release.md b/Website/docs/changelog/next-release.md
index 66230d16bc..a7094d287f 100644
--- a/Website/docs/changelog/next-release.md
+++ b/Website/docs/changelog/next-release.md
@@ -25,8 +25,11 @@ Release date: **xx.xx.2025**
 
 ## Improvements
 
-## Bug Fixes
+**Remote Desktop**
 
+- Redesign RDP connect dialog (migrated from dialog to child window). [#3216](https://github.com/BornToBeRoot/NETworkManager/pull/3216)
+
+## Bug Fixes
 
 ## Dependencies, Refactoring & Documentation
 

From 06bec4043b564abcd66a59f42398c03ac901f8a8 Mon Sep 17 00:00:00 2001
From: BornToBeRoot <16019165+BornToBeRoot@users.noreply.github.com>
Date: Sun, 26 Oct 2025 23:44:59 +0100
Subject: [PATCH 5/5] Docs: #3216

---
 Website/docs/application/remote-desktop.md | 24 ++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/Website/docs/application/remote-desktop.md b/Website/docs/application/remote-desktop.md
index 796316d3ca..1df2ad1d48 100644
--- a/Website/docs/application/remote-desktop.md
+++ b/Website/docs/application/remote-desktop.md
@@ -106,6 +106,14 @@ Only available if [Use credentials](#use-credentials) is enabled.
 
 :::
 
+### Admin (console) session
+
+Connect to the admin (console) session of the remote computer.
+
+**Type:** `Boolean`
+
+**Default:** `Disabled`
+
 ## Profile
 
 ### Inherit host from general
@@ -197,6 +205,14 @@ Passwords are stored in plain text in the profile file unless [Profile file encr
 
 :::
 
+### Admin (console) session
+
+Connect to the admin (console) session of the remote computer.
+
+**Type:** `Boolean`
+
+**Default:** `Disabled`
+
 ### Display
 
 Display setting used for the remote desktop connection.
@@ -597,6 +613,14 @@ Passwords are stored in plain text in the profile file unless [Profile file encr
 
 :::
 
+### Admin (console) session
+
+Connect to the admin (console) session of the remote computer.
+
+**Type:** `Boolean`
+
+**Default:** `Disabled`
+
 ### Display
 
 Display setting used for the remote desktop connection.