Merge pull request #1662 from GreyCorbel/release/v1.76

Added support for password retrieval via AdmPwd.E 7.7.1

CHANGELOG.TXT

@@ -1,3 +1,130 @@
+1.76.20 (2019-04-12):
+
+Fixes:
+------
+#1401: Connections corrupted when importing RDC Manager files that are missing certain fields
+
+
+1.76.19 (2019-04-04):
+
+Fixes:
+------
+#1374: Vertical Scroll Bar missing in PuTTYNG after 0.70.0.1 & 0.71 updates
+
+
+1.76.18 (2019-03-20):
+
+Fixes:
+------
+#1365: PuTTY window not centered after 0.71 update
+
+
+1.76.17 (2019-03-20):
+
+Fixes:
+------
+#1362: Updated PuTTYNG to 0.71
+
+
+1.76.16 (2019-03-14):
+
+Fixes:
+------
+#1347: Remote Desktop Gateway username field encrypted instead of password
+
+
+1.76.15 (2019-03-09):
+
+Fixes:
+------
+#1303: Exception on first connection with new SQL server database
+#1304: Resolved several issues with importing multiple RDP Manager v2.7 files
+
+Features/Enhancements:
+----------------------
+Importing multiple files now only causes 1 save event, rather than 1 per file imported.
+
+
+1.76.14 (2019-02-08):
+
+Features/Enhancements:
+----------------------
+#222: Allow FIPS to be enabled
+
+
+1.76.13 (2018-12-22):
+
+Changes:
+--------
+#222: Pre-Release Test build for running on systems with FIPS Enabled
+
+
+1.76.12 (2018-11-08):
+
+Features/Enhancements:
+----------------------
+#1180: Allow saving certain connection properties locally when using database
+
+Fixes:
+------
+#1181: Connections sometimes dont immediately load when switching to sql feature
+#1173: Fixed memory leak when loading connections multiple times
+#1168: Autohide Connection and Config tab won't open when ssh connection active
+#1134: Fixed issue where opening a connection opens same connection on other clients when using database feature
+#449: Encrypt passwords saved to database
+
+
+1.76.11 (2018-10-18):
+
+Fixes:
+------
+#1139: Feature "Reconnect to previously opened sessions" not working
+#1136: Putty window not maximized
+
+
+1.76.10 (2018-10-07):
+
+Fixes:
+------
+#1124: Enabling themes causes an exception
+
+
+1.76.9 (2018-10-07):
+
+Fixes:
+------
+#1117: Duplicate panel created when "Reconnect on Startup" and "Create Empty Panel" settings enabled
+#1115: Exception when changing from xml data storage to SQL
+#1110: Pressing Delete button during connection rename attempts to delete the connection instead of the text
+#1106: Inheritance does not work when parent has C# default type set
+#1092: Invalid Cast Exceptions loading default connectioninfo 
+#1091: Minor themeing issues
+#853: Added some additional safety checks and logging to help address RDP crashes
+
+
+1.76.8 (2018-08-25):
+
+Fixes:
+------
+#1088: Delete and Launch buttons are not disabled when last external tool deleted
+#1087: 'Save connections after every edit' setting not honored
+#1082: Connections not given GUID if Id is empty in connection xml
+
+
+1.76.7 (2018-08-22):
+
+Fixes:
+------
+#1076: Wrong object selected when duplicating connection then switching between properties and inheritance in config window
+#1068: Fixed some toolbar positioning bugs
+
+
+1.76.6 (2018-08-03):
+
+Fixes:
+------
+#1062: Entering correct password when starting app does not load connections file
+
 1.76.5 (2018-08-02):
 
 Fixes:

CREDITS.TXT

@@ -24,6 +24,7 @@ github.com/pfjason
 github.com/sirLoaf
 github.com/Fyers
 Vladimir Semenov (github.com/sli-pro)
+Stephan (github.com/st-schuler)
 
 
 Past Contributors

Jenkinsfile_publish.groovy

@@ -62,11 +62,10 @@ node('windows') {
 	
     stage ('Publish to GitHub') {
         withCredentials([string(credentialsId: '5443a369-dbe8-42d3-b4e8-04d0b4e9039a', variable: 'GH_AUTH_TOKEN')]) {
-            def zipPath = "${jobDir}\\Release\\*.zip"
-            def msiPath = "${jobDir}\\Release\\*.msi"
+            def releaseFolder = "${jobDir}\\Release"
             // because batch files suck at handling newline characters, we have to convert to base64 in groovy and back to text in powershell
             def base64Description = env.ReleaseDescription.bytes.encodeBase64().toString()
-            bat "powershell -ExecutionPolicy Bypass -File \"${jobDir}\\Tools\\publish_to_github.ps1\" -Owner \"mRemoteNG\" -Repository \"mRemoteNG\" -ReleaseTitle \"${env.ReleaseTitle}\" -TagName \"${env.TagName}\" -TargetCommitish \"${env.TargetBranch}\" -Description \"${base64Description}\" -IsDraft ${env.IsDraft} -IsPrerelease ${env.IsPreRelease} -ZipFilePath \"${zipPath}\" -MsiFilePath \"${msiPath}\" -AuthToken \"${env.GH_AUTH_TOKEN}\" -DescriptionIsBase64Encoded"
+            bat "powershell -ExecutionPolicy Bypass -File \"${jobDir}\\Tools\\publish_to_github.ps1\" -Owner \"mRemoteNG\" -Repository \"mRemoteNG\" -ReleaseTitle \"${env.ReleaseTitle}\" -TagName \"${env.TagName}\" -TargetCommitish \"${env.TargetBranch}\" -Description \"${base64Description}\" -IsDraft ${env.IsDraft} -IsPrerelease ${env.IsPreRelease} -ReleaseFolderPath \"${releaseFolder}\" -AuthToken \"${env.GH_AUTH_TOKEN}\" -DescriptionIsBase64Encoded"
         }
     }
 }

Tools/copy_release_installer.ps1

@@ -17,5 +17,7 @@ if (!(Test-Path -Path $DestinationDir))
 $sourceFiles = Get-ChildItem -Path $SourcePath -Recurse | ?{$_.Extension -match "exe|msi"}
 foreach ($item in $sourceFiles)
 {
+    $item.Name
+    (Get-FileHash -Path $item.fullName -Algorithm SHA512).Hash
     Copy-Item -Path $item.FullName -Destination $DestinationDir -Force
 }

Tools/github_functions.ps1

@@ -171,17 +171,26 @@ function Upload-GitHubReleaseAsset {
         [string]
         [Parameter(Mandatory=$true)]
         # The OAuth2 token to use for authentication.
-        $AuthToken
+        $AuthToken,
+
+        [string]
+        # A short description label for the asset
+        $Label = ""
     )
 
     $UploadUri = $UploadUri -replace "(\{[\w,\?]*\})$"
     $files = Get-Item -Path $FilePath
 
+    $labelParam = ""
+    if ($Label -ne "") {
+        $labelParam = "&label=$Label"
+    }
+
     # Get-Item could produce an array of files if a wildcard is provided. (C:\*.txt)
     # Upload each matching item individually
     foreach ($file in $files) {
         Write-Output "Uploading asset to GitHub release: '$($file.FullName)'"
-        $req_uploadZipAsset = Invoke-WebRequest -Uri "$($UploadUri)?name=$($file.Name)" -Method Post -Headers @{"Authorization"="token $AuthToken"} -ContentType $ContentType -InFile $file.FullName -ErrorAction Stop
+        $req_uploadZipAsset = Invoke-WebRequest -Uri "$($UploadUri)?name=$($file.Name)$labelParam" -Method Post -Headers @{"Authorization"="token $AuthToken"} -ContentType $ContentType -InFile $file.FullName -ErrorAction Stop
     }
 }
 

Tools/publish_to_github.ps1

@@ -43,13 +43,8 @@ param (
 
     [string]
     [Parameter(Mandatory=$true)]
-    # Path to the zip file to upload with the release
-    $ZipFilePath,
-
-    [string]
-    [Parameter(Mandatory=$true)]
-    #Path to the msi file to upload with the release
-    $MsiFilePath,
+    # Path to the folder which contains release assets to upload
+    $ReleaseFolderPath,
 
     [string]
     [Parameter(Mandatory=$true)]
@@ -70,7 +65,17 @@ if ($DescriptionIsBase64Encoded) {
 . "$PSScriptRoot\github_functions.ps1"
 
 
+$releaseFolderItems = Get-ChildItem -Path $ReleaseFolderPath
+$mrngPortablePath = ($releaseFolderItems | ?{$_.Name -match "portable-[\d\.]+\.zip"}).FullName
+$mrngNormalPath = ($releaseFolderItems | ?{$_.Name -match "installer-[\d\.]+\.msi"}).FullName
+$mrngPortableSymbolsPath = ($releaseFolderItems | ?{$_.Name -match "mremoteng-portable-symbols-[\d\.]+\.zip"}).FullName
+$mrngNormalSymbolsPath = ($releaseFolderItems | ?{$_.Name -match "mremoteng-symbols-[\d\.]+\.zip"}).FullName
+
+
 $release = Publish-GitHubRelease -Owner $Owner -Repository $Repository -ReleaseTitle $ReleaseTitle -TagName $TagName -TargetCommitish $TargetCommitish -Description $Description -IsDraft ([bool]::Parse($IsDraft)) -IsPrerelease ([bool]::Parse($IsPrerelease)) -AuthToken $AuthToken
-$zipUpload = Upload-GitHubReleaseAsset -UploadUri $release.upload_url -FilePath $ZipFilePath -ContentType "application/zip" -AuthToken $AuthToken
-$msiUpload = Upload-GitHubReleaseAsset -UploadUri $release.upload_url -FilePath $MsiFilePath -ContentType "application/octet-stream" -AuthToken $AuthToken
+$zipUpload = Upload-GitHubReleaseAsset -UploadUri $release.upload_url -FilePath $mrngPortablePath -ContentType "application/zip" -AuthToken $AuthToken -Label "Portable Edition (zip)"
+$msiUpload = Upload-GitHubReleaseAsset -UploadUri $release.upload_url -FilePath $mrngNormalPath -ContentType "application/octet-stream" -AuthToken $AuthToken -Label "Normal Edition (msi)"
+
+$portableEditionSymbols = Upload-GitHubReleaseAsset -UploadUri $release.upload_url -FilePath $mrngPortableSymbolsPath -ContentType "application/zip" -AuthToken $AuthToken -Label "Portable Edition Debug Symbols"
+$normalEditionSymbols = Upload-GitHubReleaseAsset -UploadUri $release.upload_url -FilePath $mrngNormalSymbolsPath -ContentType "application/zip" -AuthToken $AuthToken -Label "Normal Edition Debug Symbols"
 Write-Output (Get-GitHubRelease -Owner $Owner -Repository $Repository -ReleaseId $release.id -AuthToken $AuthToken)

Tools/zip_portable_files.ps1

@@ -56,6 +56,8 @@ if ($ConfigurationName -eq "Release Portable") {
     Remove-Item -Force  $PortableZip -ErrorAction SilentlyContinue
     & $SEVENZIP a -bt -bd -bb1 -mx=9 -tzip -y -r $PortableZip (Join-Path -Path $tempFolderPath -ChildPath "*.*")
     #& $SEVENZIP a -bt -mx=9 -tzip -y $PortableZip "$($SolutionDir)*.TXT"
+    (Get-FileHash -Path $PortableZip -Algorithm SHA512).Hash
+
 }
 else {
     Write-Output "We will not zip anything - this isnt a portable release build."

mRemoteNGTests/App/ImportTests.cs

@@ -0,0 +1,47 @@
+using System.IO;
+using mRemoteNG.App;
+using mRemoteNG.Config.Putty;
+using mRemoteNG.Connection;
+using mRemoteNG.Container;
+using mRemoteNGTests.Properties;
+using mRemoteNGTests.TestHelpers;
+using NUnit.Framework;
+
+namespace mRemoteNGTests.App
+{
+	public class ImportTests
+	{
+		[Test]
+		public void ErrorHandlerCalledWhenUnsupportedFileExtensionFound()
+		{
+			using (FileTestHelpers.DisposableTempFile(out var file, ".blah"))
+			{
+				var conService = new ConnectionsService(PuttySessionsManager.Instance);
+				var container = new ContainerInfo();
+				var exceptionOccurred = false;
+
+				Import.HeadlessFileImport(new []{file}, container, conService, s => exceptionOccurred = true);
+
+				Assert.That(exceptionOccurred);
+			}
+		}
+
+		[Test]
+		public void AnErrorInOneFileDoNotPreventOtherFilesFromProcessing()
+		{
+			using (FileTestHelpers.DisposableTempFile(out var badFile, ".blah"))
+			using (FileTestHelpers.DisposableTempFile(out var rdpFile, ".rdp"))
+			{
+				File.AppendAllText(rdpFile, Resources.test_remotedesktopconnection_rdp);
+				var conService = new ConnectionsService(PuttySessionsManager.Instance);
+				var container = new ContainerInfo();
+				var exceptionCount = 0;
+				
+				Import.HeadlessFileImport(new[] { badFile, rdpFile }, container, conService, s => exceptionCount++);
+
+				Assert.That(exceptionCount, Is.EqualTo(1));
+				Assert.That(container.Children, Has.One.Items);
+			}
+		}
+	}
+}

mRemoteNGTests/Config/Serializers/DataTableDeserializerTests.cs

@@ -1,10 +1,12 @@
 using System.Data;
-using System.Linq;
-using mRemoteNG.Config.Serializers;
+using System.Security;
+using mRemoteNG.Config.Serializers.MsSql;
 using mRemoteNG.Connection;
 using mRemoteNG.Security;
+using mRemoteNG.Security.SymmetricEncryption;
 using mRemoteNG.Tree;
 using mRemoteNGTests.TestHelpers;
+using NSubstitute;
 using NUnit.Framework;
 
 namespace mRemoteNGTests.Config.Serializers
@@ -12,30 +14,37 @@ namespace mRemoteNGTests.Config.Serializers
     public class DataTableDeserializerTests
     {
         private DataTableDeserializer _deserializer;
+        private ICryptographyProvider _cryptographyProvider;
+
+        [SetUp]
+        public void Setup()
+        {
+            _cryptographyProvider = new LegacyRijndaelCryptographyProvider();
+        }
 
         [Test]
         public void WeCanDeserializeATree()
         {
             var model = CreateConnectionTreeModel();
             var dataTable = CreateDataTable(model.RootNodes[0]);
-            _deserializer = new DataTableDeserializer();
+            _deserializer = new DataTableDeserializer(_cryptographyProvider, new SecureString());
             var output = _deserializer.Deserialize(dataTable);
-            Assert.That(output.GetRecursiveChildList().Count(), Is.EqualTo(model.GetRecursiveChildList().Count()));
+            Assert.That(output.GetRecursiveChildList().Count, Is.EqualTo(model.GetRecursiveChildList().Count));
         }
 
         [Test]
         public void WeCanDeserializeASingleEntry()
         {
             var dataTable = CreateDataTable(new ConnectionInfo());
-            _deserializer = new DataTableDeserializer();
+            _deserializer = new DataTableDeserializer(_cryptographyProvider, new SecureString());
             var output = _deserializer.Deserialize(dataTable);
-            Assert.That(output.GetRecursiveChildList().Count(), Is.EqualTo(1));
+            Assert.That(output.GetRecursiveChildList().Count, Is.EqualTo(1));
         }
 
 
         private DataTable CreateDataTable(ConnectionInfo tableContent)
         {
-            var serializer = new DataTableSerializer(new SaveFilter());
+            var serializer = new DataTableSerializer(new SaveFilter(), _cryptographyProvider, new SecureString());
             return serializer.Serialize(tableContent);
         }
 

mRemoteNGTests/Config/Serializers/DataTableSerializerTests.cs

@@ -1,11 +1,15 @@
 using System.Linq;
+using System.Security;
 using mRemoteNG.Config.Serializers;
+using mRemoteNG.Config.Serializers.MsSql;
 using mRemoteNG.Connection;
 using mRemoteNG.Container;
 using mRemoteNG.Security;
+using mRemoteNG.Security.SymmetricEncryption;
 using mRemoteNG.Tree;
 using mRemoteNG.Tree.Root;
 using mRemoteNGTests.TestHelpers;
+using NSubstitute;
 using NUnit.Framework;
 
 namespace mRemoteNGTests.Config.Serializers
@@ -19,7 +23,10 @@ namespace mRemoteNGTests.Config.Serializers
         public void Setup()
         {
             _saveFilter = new SaveFilter();
-            _dataTableSerializer = new DataTableSerializer(_saveFilter);
+            _dataTableSerializer = new DataTableSerializer(
+                _saveFilter, 
+                new LegacyRijndaelCryptographyProvider(), 
+                new SecureString());
         }
 
         [Test]

mRemoteNGTests/Config/Serializers/MiscSerializers/RemoteDesktopConnectionManager27DeserializerTests.cs

@@ -1,20 +1,21 @@
-using System.IO;
+using System;
+using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using mRemoteNG.Config.Serializers;
+using mRemoteNG.Connection;
 using mRemoteNG.Connection.Protocol;
 using mRemoteNG.Connection.Protocol.RDP;
 using mRemoteNG.Container;
-using mRemoteNG.Tree;
 using mRemoteNGTests.Properties;
 using NUnit.Framework;
 
 namespace mRemoteNGTests.Config.Serializers.MiscSerializers
 {
-    public class RemoteDesktopConnectionManager27DeserializerTests
+	public class RemoteDesktopConnectionManager27DeserializerTests
     {
         private string _connectionFileContents;
         private RemoteDesktopConnectionManagerDeserializer _deserializer;
-        private ConnectionTreeModel _connectionTreeModel;
         private const string ExpectedName = "server1_displayname";
         private const string ExpectedHostname = "server1";
         private const string ExpectedDescription = "Comment text here";
@@ -44,265 +45,80 @@ namespace mRemoteNGTests.Config.Serializers.MiscSerializers
         {
             _connectionFileContents = Resources.test_rdcman_v2_7_schema3;
             _deserializer = new RemoteDesktopConnectionManagerDeserializer();
-            _connectionTreeModel = _deserializer.Deserialize(_connectionFileContents);
         }
 
         [Test]
         public void ConnectionTreeModelHasARootNode()
         {
-            var numberOfRootNodes = _connectionTreeModel.RootNodes.Count;
+	        var connectionTreeModel = _deserializer.Deserialize(_connectionFileContents);
+			var numberOfRootNodes = connectionTreeModel.RootNodes.Count;
             Assert.That(numberOfRootNodes, Is.GreaterThan(0));
         }
 
         [Test]
         public void RootNodeHasContents()
         {
-            var rootNodeContents = _connectionTreeModel.RootNodes.First().Children;
+	        var connectionTreeModel = _deserializer.Deserialize(_connectionFileContents);
+			var rootNodeContents = connectionTreeModel.RootNodes.First().Children;
             Assert.That(rootNodeContents, Is.Not.Empty);
         }
 
         [Test]
         public void AllSubRootFoldersImported()
         {
-            var rootNode = _connectionTreeModel.RootNodes.First();
+	        var connectionTreeModel = _deserializer.Deserialize(_connectionFileContents);
+			var rootNode = connectionTreeModel.RootNodes.First();
             var importedRdcmanRootNode = rootNode.Children.OfType<ContainerInfo>().First();
             var rootNodeContents = importedRdcmanRootNode.Children.Count(node => node.Name == "Group1" || node.Name == "Group2");
             Assert.That(rootNodeContents, Is.EqualTo(2));
         }
 
-        [Test]
-        public void ConnectionDisplayNameImported()
+        [TestCaseSource(nameof(ExpectedPropertyValues))]
+        public void PropertiesWithValuesAreCorrectlyImported(Func<ConnectionInfo, object> propSelector, object expectedValue)
         {
-            var rootNode = _connectionTreeModel.RootNodes.First();
-            var importedRdcmanRootNode = rootNode.Children.OfType<ContainerInfo>().First();
-            var group1 = importedRdcmanRootNode.Children.OfType<ContainerInfo>().First(node => node.Name == "Group1");
-            var connection = group1.Children.First();
-            Assert.That(connection.Name, Is.EqualTo(ExpectedName));
+	        var connectionTreeModel = _deserializer.Deserialize(_connectionFileContents);
+
+			var connection = connectionTreeModel
+				.GetRecursiveChildList()
+				.OfType<ContainerInfo>()
+				.First(node => node.Name == "Group1")
+				.Children
+				.First();
+
+            Assert.That(propSelector(connection), Is.EqualTo(expectedValue));
         }
 
-        [Test]
-        public void ConnectionHostnameImported()
+		[TestCaseSource(nameof(NullPropertyValues))]
+        public void PropertiesWithoutValuesAreIgnored(Func<ConnectionInfo, object> propSelector)
         {
-            var rootNode = _connectionTreeModel.RootNodes.First();
-            var importedRdcmanRootNode = rootNode.Children.OfType<ContainerInfo>().First();
-            var group1 = importedRdcmanRootNode.Children.OfType<ContainerInfo>().First(node => node.Name == "Group1");
-            var connection = group1.Children.First();
-            Assert.That(connection.Hostname, Is.EqualTo(ExpectedHostname));
+	        var connectionTreeModel = _deserializer.Deserialize(Resources.test_rdcman_v2_7_schema3_empty_values);
+
+	        var importedConnection = connectionTreeModel
+		        .GetRecursiveChildList()
+		        .OfType<ContainerInfo>()
+		        .First(node => node.Name == "Group1")
+		        .Children
+		        .First();
+
+			Assert.That(propSelector(importedConnection), Is.EqualTo(propSelector(new ConnectionInfo())));
         }
 
-        [Test]
-        public void ConnectionDescriptionImported()
+        [TestCaseSource(nameof(NullPropertyValues))]
+        public void NonExistantPropertiesAreIgnored(Func<ConnectionInfo, object> propSelector)
         {
-            var rootNode = _connectionTreeModel.RootNodes.First();
-            var importedRdcmanRootNode = rootNode.Children.OfType<ContainerInfo>().First();
-            var group1 = importedRdcmanRootNode.Children.OfType<ContainerInfo>().First(node => node.Name == "Group1");
-            var connection = group1.Children.First();
-            Assert.That(connection.Description, Is.EqualTo(ExpectedDescription));
+	        var connectionTreeModel = _deserializer.Deserialize(Resources.test_rdcman_v2_7_schema3_null_values);
+
+	        var importedConnection = connectionTreeModel
+		        .GetRecursiveChildList()
+		        .OfType<ContainerInfo>()
+		        .First(node => node.Name == "Group1")
+		        .Children
+		        .First();
+
+	        Assert.That(propSelector(importedConnection), Is.EqualTo(propSelector(new ConnectionInfo())));
         }
 
-        [Test]
-        public void ConnectionUsernameImported()
-        {
-            var rootNode = _connectionTreeModel.RootNodes.First();
-            var importedRdcmanRootNode = rootNode.Children.OfType<ContainerInfo>().First();
-            var group1 = importedRdcmanRootNode.Children.OfType<ContainerInfo>().First(node => node.Name == "Group1");
-            var connection = group1.Children.First();
-            Assert.That(connection.Username, Is.EqualTo(ExpectedUsername));
-        }
-
-        [Test]
-        public void ConnectionDomainImported()
-        {
-            var rootNode = _connectionTreeModel.RootNodes.First();
-            var importedRdcmanRootNode = rootNode.Children.OfType<ContainerInfo>().First();
-            var group1 = importedRdcmanRootNode.Children.OfType<ContainerInfo>().First(node => node.Name == "Group1");
-            var connection = group1.Children.First();
-            Assert.That(connection.Domain, Is.EqualTo(ExpectedDomain));
-        }
-
-        // Since password is encrypted with a machine key, cant test decryption on another machine
-        //[Test]
-        //public void ConnectionPasswordImported()
-        //{
-        //    var rootNode = _connectionTreeModel.RootNodes.First();
-        //    var importedRdcmanRootNode = rootNode.Children.OfType<ContainerInfo>().First();
-        //    var group1 = importedRdcmanRootNode.Children.OfType<ContainerInfo>().First(node => node.Name == "Group1");
-        //    var connection = group1.Children.First();
-        //    Assert.That(connection.Password, Is.EqualTo(ExpectedPassword));
-        //}
-
-        [Test]
-        public void ConnectionProtocolSetToRdp()
-        {
-            var rootNode = _connectionTreeModel.RootNodes.First();
-            var importedRdcmanRootNode = rootNode.Children.OfType<ContainerInfo>().First();
-            var group1 = importedRdcmanRootNode.Children.OfType<ContainerInfo>().First(node => node.Name == "Group1");
-            var connection = group1.Children.First();
-            Assert.That(connection.Protocol, Is.EqualTo(ProtocolType.RDP));
-        }
-
-        [Test]
-        public void ConnectionUseConsoleSessionImported()
-        {
-            var rootNode = _connectionTreeModel.RootNodes.First();
-            var importedRdcmanRootNode = rootNode.Children.OfType<ContainerInfo>().First();
-            var group1 = importedRdcmanRootNode.Children.OfType<ContainerInfo>().First(node => node.Name == "Group1");
-            var connection = group1.Children.First();
-            Assert.That(connection.UseConsoleSession, Is.EqualTo(ExpectedUseConsoleSession));
-        }
-
-        [Test]
-        public void ConnectionPortImported()
-        {
-            var rootNode = _connectionTreeModel.RootNodes.First();
-            var importedRdcmanRootNode = rootNode.Children.OfType<ContainerInfo>().First();
-            var group1 = importedRdcmanRootNode.Children.OfType<ContainerInfo>().First(node => node.Name == "Group1");
-            var connection = group1.Children.First();
-            Assert.That(connection.Port, Is.EqualTo(ExpectedPort));
-        }
-
-        [Test]
-        public void ConnectionGatewayUsageMethodImported()
-        {
-            var rootNode = _connectionTreeModel.RootNodes.First();
-            var importedRdcmanRootNode = rootNode.Children.OfType<ContainerInfo>().First();
-            var group1 = importedRdcmanRootNode.Children.OfType<ContainerInfo>().First(node => node.Name == "Group1");
-            var connection = group1.Children.First();
-            Assert.That(connection.RDGatewayUsageMethod, Is.EqualTo(ExpectedGatewayUsageMethod));
-        }
-
-        [Test]
-        public void ConnectionGatewayHostnameImported()
-        {
-            var rootNode = _connectionTreeModel.RootNodes.First();
-            var importedRdcmanRootNode = rootNode.Children.OfType<ContainerInfo>().First();
-            var group1 = importedRdcmanRootNode.Children.OfType<ContainerInfo>().First(node => node.Name == "Group1");
-            var connection = group1.Children.First();
-            Assert.That(connection.RDGatewayHostname, Is.EqualTo(ExpectedGatewayHostname));
-        }
-
-        [Test]
-        public void ConnectionGatewayUsernameImported()
-        {
-            var rootNode = _connectionTreeModel.RootNodes.First();
-            var importedRdcmanRootNode = rootNode.Children.OfType<ContainerInfo>().First();
-            var group1 = importedRdcmanRootNode.Children.OfType<ContainerInfo>().First(node => node.Name == "Group1");
-            var connection = group1.Children.First();
-            Assert.That(connection.RDGatewayUsername, Is.EqualTo(ExpectedGatewayUsername));
-        }
-
-        // Since password is encrypted with a machine key, cant test decryption on another machine
-        //[Test]
-        //public void ConnectionGatewayPasswordImported()
-        //{
-        //    var rootNode = _connectionTreeModel.RootNodes.First();
-        //    var importedRdcmanRootNode = rootNode.Children.OfType<ContainerInfo>().First();
-        //    var group1 = importedRdcmanRootNode.Children.OfType<ContainerInfo>().First(node => node.Name == "Group1");
-        //    var connection = group1.Children.First();
-        //    Assert.That(connection.RDGatewayPassword, Is.EqualTo(ExpectedGatewayPassword));
-        //}
-
-        [Test]
-        public void ConnectionGatewayDomainImported()
-        {
-            var rootNode = _connectionTreeModel.RootNodes.First();
-            var importedRdcmanRootNode = rootNode.Children.OfType<ContainerInfo>().First();
-            var group1 = importedRdcmanRootNode.Children.OfType<ContainerInfo>().First(node => node.Name == "Group1");
-            var connection = group1.Children.First();
-            Assert.That(connection.RDGatewayDomain, Is.EqualTo(ExpectedGatewayDomain));
-        }
-
-        [Test]
-        public void ConnectionResolutionImported()
-        {
-            var rootNode = _connectionTreeModel.RootNodes.First();
-            var importedRdcmanRootNode = rootNode.Children.OfType<ContainerInfo>().First();
-            var group1 = importedRdcmanRootNode.Children.OfType<ContainerInfo>().First(node => node.Name == "Group1");
-            var connection = group1.Children.First();
-            Assert.That(connection.Resolution, Is.EqualTo(ExpectedRdpResolution));
-        }
-
-        [Test]
-        public void ConnectionColorDepthImported()
-        {
-            var rootNode = _connectionTreeModel.RootNodes.First();
-            var importedRdcmanRootNode = rootNode.Children.OfType<ContainerInfo>().First();
-            var group1 = importedRdcmanRootNode.Children.OfType<ContainerInfo>().First(node => node.Name == "Group1");
-            var connection = group1.Children.First();
-            Assert.That(connection.Colors, Is.EqualTo(ExpectedRdpColorDepth));
-        }
-
-        [Test]
-        public void ConnectionAudioRedirectionImported()
-        {
-            var rootNode = _connectionTreeModel.RootNodes.First();
-            var importedRdcmanRootNode = rootNode.Children.OfType<ContainerInfo>().First();
-            var group1 = importedRdcmanRootNode.Children.OfType<ContainerInfo>().First(node => node.Name == "Group1");
-            var connection = group1.Children.First();
-            Assert.That(connection.RedirectSound, Is.EqualTo(ExpectedAudioRedirection));
-        }
-
-        [Test]
-        public void ConnectionKeyRedirectionImported()
-        {
-            var rootNode = _connectionTreeModel.RootNodes.First();
-            var importedRdcmanRootNode = rootNode.Children.OfType<ContainerInfo>().First();
-            var group1 = importedRdcmanRootNode.Children.OfType<ContainerInfo>().First(node => node.Name == "Group1");
-            var connection = group1.Children.First();
-            Assert.That(connection.RedirectKeys, Is.EqualTo(ExpectedKeyRedirection));
-        }
-
-        [Test]
-        public void ConnectionDriveRedirectionImported()
-        {
-            var rootNode = _connectionTreeModel.RootNodes.First();
-            var importedRdcmanRootNode = rootNode.Children.OfType<ContainerInfo>().First();
-            var group1 = importedRdcmanRootNode.Children.OfType<ContainerInfo>().First(node => node.Name == "Group1");
-            var connection = group1.Children.First();
-            Assert.That(connection.RedirectDiskDrives, Is.EqualTo(ExpectedDriveRedirection));
-        }
-
-        [Test]
-        public void ConnectionPortRedirectionImported()
-        {
-            var rootNode = _connectionTreeModel.RootNodes.First();
-            var importedRdcmanRootNode = rootNode.Children.OfType<ContainerInfo>().First();
-            var group1 = importedRdcmanRootNode.Children.OfType<ContainerInfo>().First(node => node.Name == "Group1");
-            var connection = group1.Children.First();
-            Assert.That(connection.RedirectPorts, Is.EqualTo(ExpectedPortRedirection));
-        }
-
-        [Test]
-        public void ConnectionPrinterRedirectionImported()
-        {
-            var rootNode = _connectionTreeModel.RootNodes.First();
-            var importedRdcmanRootNode = rootNode.Children.OfType<ContainerInfo>().First();
-            var group1 = importedRdcmanRootNode.Children.OfType<ContainerInfo>().First(node => node.Name == "Group1");
-            var connection = group1.Children.First();
-            Assert.That(connection.RedirectPrinters, Is.EqualTo(ExpectedPrinterRedirection));
-        }
-
-        [Test]
-        public void ConnectionSmartcardRedirectionImported()
-        {
-            var rootNode = _connectionTreeModel.RootNodes.First();
-            var importedRdcmanRootNode = rootNode.Children.OfType<ContainerInfo>().First();
-            var group1 = importedRdcmanRootNode.Children.OfType<ContainerInfo>().First(node => node.Name == "Group1");
-            var connection = group1.Children.First();
-            Assert.That(connection.RedirectSmartCards, Is.EqualTo(ExpectedSmartcardRedirection));
-        }
-
-        [Test]
-        public void ConnectionauthenticationLevelImported()
-        {
-            var rootNode = _connectionTreeModel.RootNodes.First();
-            var importedRdcmanRootNode = rootNode.Children.OfType<ContainerInfo>().First();
-            var group1 = importedRdcmanRootNode.Children.OfType<ContainerInfo>().First(node => node.Name == "Group1");
-            var connection = group1.Children.First();
-            Assert.That(connection.RDPAuthenticationLevel, Is.EqualTo(ExpectedAuthLevel));
-        }
-
-        [Test]
+		[Test]
         public void ExceptionThrownOnBadSchemaVersion()
         {
             var badFileContents = Resources.test_rdcman_v2_2_badschemaversion;
@@ -322,5 +138,61 @@ namespace mRemoteNGTests.Config.Serializers.MiscSerializers
             var badFileContents = Resources.test_rdcman_noversion;
             Assert.That(() => _deserializer.Deserialize(badFileContents), Throws.TypeOf<FileFormatException>());
         }
+
+        private static IEnumerable<TestCaseData> ExpectedPropertyValues()
+        {
+	        return new[]
+	        {
+		        new TestCaseData((Func<ConnectionInfo,object>)(con => con.Name), ExpectedName).SetName(nameof(ConnectionInfo.Name)),
+				new TestCaseData((Func<ConnectionInfo,object>)(con => con.Hostname), ExpectedHostname).SetName(nameof(ConnectionInfo.Hostname)),
+				new TestCaseData((Func<ConnectionInfo,object>)(con => con.Description), ExpectedDescription).SetName(nameof(ConnectionInfo.Description)),
+				new TestCaseData((Func<ConnectionInfo,object>)(con => con.Username), ExpectedUsername).SetName(nameof(ConnectionInfo.Username)),
+				new TestCaseData((Func<ConnectionInfo,object>)(con => con.Domain), ExpectedDomain).SetName(nameof(ConnectionInfo.Domain)),
+				new TestCaseData((Func<ConnectionInfo,object>)(con => con.Protocol), ProtocolType.RDP).SetName(nameof(ConnectionInfo.Protocol)),
+				new TestCaseData((Func<ConnectionInfo,object>)(con => con.UseConsoleSession), ExpectedUseConsoleSession).SetName(nameof(ConnectionInfo.UseConsoleSession)),
+				new TestCaseData((Func<ConnectionInfo,object>)(con => con.Port), ExpectedPort).SetName(nameof(ConnectionInfo.Port)),
+				new TestCaseData((Func<ConnectionInfo,object>)(con => con.RDGatewayUsageMethod), ExpectedGatewayUsageMethod).SetName(nameof(ConnectionInfo.RDGatewayUsageMethod)),
+				new TestCaseData((Func<ConnectionInfo,object>)(con => con.RDGatewayHostname), ExpectedGatewayHostname).SetName(nameof(ConnectionInfo.RDGatewayHostname)),
+				new TestCaseData((Func<ConnectionInfo,object>)(con => con.RDGatewayUsername), ExpectedGatewayUsername).SetName(nameof(ConnectionInfo.RDGatewayUsername)),
+				new TestCaseData((Func<ConnectionInfo,object>)(con => con.RDGatewayDomain), ExpectedGatewayDomain).SetName(nameof(ConnectionInfo.RDGatewayDomain)),
+				new TestCaseData((Func<ConnectionInfo,object>)(con => con.Resolution), ExpectedRdpResolution).SetName(nameof(ConnectionInfo.Resolution)),
+				new TestCaseData((Func<ConnectionInfo,object>)(con => con.Colors), ExpectedRdpColorDepth).SetName(nameof(ConnectionInfo.Colors)),
+				new TestCaseData((Func<ConnectionInfo,object>)(con => con.RedirectSound), ExpectedAudioRedirection).SetName(nameof(ConnectionInfo.RedirectSound)),
+				new TestCaseData((Func<ConnectionInfo,object>)(con => con.RedirectKeys), ExpectedKeyRedirection).SetName(nameof(ConnectionInfo.RedirectKeys)),
+		        new TestCaseData((Func<ConnectionInfo,object>)(con => con.RDPAuthenticationLevel), ExpectedAuthLevel).SetName(nameof(ConnectionInfo.RDPAuthenticationLevel)),
+		        new TestCaseData((Func<ConnectionInfo,object>)(con => con.RedirectSmartCards), ExpectedSmartcardRedirection).SetName(nameof(ConnectionInfo.RedirectSmartCards)),
+		        new TestCaseData((Func<ConnectionInfo,object>)(con => con.RedirectPrinters), ExpectedPrinterRedirection).SetName(nameof(ConnectionInfo.RedirectPrinters)),
+		        new TestCaseData((Func<ConnectionInfo,object>)(con => con.RedirectPorts), ExpectedPortRedirection).SetName(nameof(ConnectionInfo.RedirectPorts)),
+		        new TestCaseData((Func<ConnectionInfo,object>)(con => con.RedirectDiskDrives), ExpectedDriveRedirection).SetName(nameof(ConnectionInfo.RedirectDiskDrives)),
+			};
+        }
+
+        private static IEnumerable<TestCaseData> NullPropertyValues()
+        {
+			return new[]
+			{
+				new TestCaseData((Func<ConnectionInfo,object>)(con => con.Name)).SetName(nameof(ConnectionInfo.Name)),
+				new TestCaseData((Func<ConnectionInfo,object>)(con => con.Hostname)).SetName(nameof(ConnectionInfo.Hostname)),
+				new TestCaseData((Func<ConnectionInfo,object>)(con => con.Description)).SetName(nameof(ConnectionInfo.Description)),
+				new TestCaseData((Func<ConnectionInfo,object>)(con => con.Username)).SetName(nameof(ConnectionInfo.Username)),
+				new TestCaseData((Func<ConnectionInfo,object>)(con => con.Domain)).SetName(nameof(ConnectionInfo.Domain)),
+				new TestCaseData((Func<ConnectionInfo,object>)(con => con.Protocol)).SetName(nameof(ConnectionInfo.Protocol)),
+				new TestCaseData((Func<ConnectionInfo,object>)(con => con.UseConsoleSession)).SetName(nameof(ConnectionInfo.UseConsoleSession)),
+				new TestCaseData((Func<ConnectionInfo,object>)(con => con.Port)).SetName(nameof(ConnectionInfo.Port)),
+				new TestCaseData((Func<ConnectionInfo,object>)(con => con.RDGatewayUsageMethod)).SetName(nameof(ConnectionInfo.RDGatewayUsageMethod)),
+				new TestCaseData((Func<ConnectionInfo,object>)(con => con.RDGatewayHostname)).SetName(nameof(ConnectionInfo.RDGatewayHostname)),
+				new TestCaseData((Func<ConnectionInfo,object>)(con => con.RDGatewayUsername)).SetName(nameof(ConnectionInfo.RDGatewayUsername)),
+				new TestCaseData((Func<ConnectionInfo,object>)(con => con.RDGatewayDomain)).SetName(nameof(ConnectionInfo.RDGatewayDomain)),
+				new TestCaseData((Func<ConnectionInfo,object>)(con => con.Resolution)).SetName(nameof(ConnectionInfo.Resolution)),
+				new TestCaseData((Func<ConnectionInfo,object>)(con => con.Colors)).SetName(nameof(ConnectionInfo.Colors)),
+				new TestCaseData((Func<ConnectionInfo,object>)(con => con.RedirectSound)).SetName(nameof(ConnectionInfo.RedirectSound)),
+				new TestCaseData((Func<ConnectionInfo,object>)(con => con.RedirectKeys)).SetName(nameof(ConnectionInfo.RedirectKeys)),
+				new TestCaseData((Func<ConnectionInfo,object>)(con => con.RDPAuthenticationLevel)).SetName(nameof(ConnectionInfo.RDPAuthenticationLevel)),
+				new TestCaseData((Func<ConnectionInfo,object>)(con => con.RedirectSmartCards)).SetName(nameof(ConnectionInfo.RedirectSmartCards)),
+				new TestCaseData((Func<ConnectionInfo,object>)(con => con.RedirectPrinters)).SetName(nameof(ConnectionInfo.RedirectPrinters)),
+				new TestCaseData((Func<ConnectionInfo,object>)(con => con.RedirectPorts)).SetName(nameof(ConnectionInfo.RedirectPorts)),
+				new TestCaseData((Func<ConnectionInfo,object>)(con => con.RedirectDiskDrives)).SetName(nameof(ConnectionInfo.RedirectDiskDrives)),
+			};
+		}
     }
 }

mRemoteNGTests/Connection/ConnectionInfoInheritanceTests.cs

@@ -1,8 +1,9 @@
 using mRemoteNG.Connection;
+using mRemoteNG.Container;
 using NUnit.Framework;
-using System.Reflection;
 using System.Collections;
 using System.Linq;
+using System.Reflection;
 
 namespace mRemoteNGTests.Connection
 {
@@ -74,6 +75,22 @@ namespace mRemoteNGTests.Connection
             Assert.That(hasEverythingInheritedProperty, Is.False);
         }
 
+        [Test]
+        public void AlwaysReturnInheritedValueIfRequested()
+        {
+            var expectedSetting = false;
+
+            var container = new ContainerInfo { AutomaticResize = expectedSetting };
+            var con1 = new ConnectionInfo
+            {
+                AutomaticResize = true,
+                Inheritance = {AutomaticResize = true}
+            };
+            container.AddChild(con1);
+
+            Assert.That(con1.AutomaticResize, Is.EqualTo(expectedSetting));
+        }
+
         private bool AllInheritancePropertiesAreTrue()
         {
             var allPropertiesTrue = true;

mRemoteNGTests/Connection/ConnectionInfoTests.cs

@@ -43,6 +43,20 @@ namespace mRemoteNGTests.Connection
             Assert.That(clonedConnection.Parent, Is.Null);
         }
 
+        [Test]
+        public void CloneAlsoCopiesInheritanceObject()
+        {
+            var clonedConnection = _connectionInfo.Clone();
+            Assert.That(clonedConnection.Inheritance, Is.Not.EqualTo(_connectionInfo.Inheritance));
+        }
+
+        [Test]
+        public void CloneCorrectlySetsParentOfInheritanceObject()
+        {
+            var clonedConnection = _connectionInfo.Clone();
+            Assert.That(clonedConnection.Inheritance.Parent, Is.EqualTo(clonedConnection));
+        }
+
         [Test]
         public void CopyFromCopiesProperties()
         {

mRemoteNGTests/IntegrationTests/XmlSerializationLifeCycleTests.cs

@@ -1,4 +1,6 @@
-using System.Linq;
+using System;
+using System.Linq;
+using System.Xml.Linq;
 using mRemoteNG.Config.Serializers;
 using mRemoteNG.Config.Serializers.Xml;
 using mRemoteNG.Connection;
@@ -29,20 +31,19 @@ namespace mRemoteNGTests.IntegrationTests
                 _originalModel.RootNodes.OfType<RootNodeInfo>().First().PasswordString.ConvertToSecureString(),
                 new SaveFilter());
             _serializer = new XmlConnectionsSerializer(cryptoProvider, nodeSerializer);
+            _deserializer = new XmlConnectionsDeserializer();
         }
 
         [TearDown]
         public void Teardown()
         {
             _serializer = null;
-            _deserializer = null;
         }
 
         [Test]
         public void SerializeThenDeserialize()
         {
             var serializedContent = _serializer.Serialize(_originalModel);
-            _deserializer = new XmlConnectionsDeserializer();
             var deserializedModel = _deserializer.Deserialize(serializedContent);
             var nodeNamesFromDeserializedModel = deserializedModel.GetRecursiveChildList().Select(node => node.Name);
             var nodeNamesFromOriginalModel = _originalModel.GetRecursiveChildList().Select(node => node.Name);
@@ -54,7 +55,6 @@ namespace mRemoteNGTests.IntegrationTests
         {
             _serializer.UseFullEncryption = true;
             var serializedContent = _serializer.Serialize(_originalModel);
-            _deserializer = new XmlConnectionsDeserializer();
             var deserializedModel = _deserializer.Deserialize(serializedContent);
             var nodeNamesFromDeserializedModel = deserializedModel.GetRecursiveChildList().Select(node => node.Name);
             var nodeNamesFromOriginalModel = _originalModel.GetRecursiveChildList().Select(node => node.Name);
@@ -66,7 +66,6 @@ namespace mRemoteNGTests.IntegrationTests
         {
             var originalConnectionInfo = new ConnectionInfo {Name = "con1", Description = "£°úg¶┬ä" };
             var serializedContent = _serializer.Serialize(originalConnectionInfo);
-            _deserializer = new XmlConnectionsDeserializer();
             var deserializedModel = _deserializer.Deserialize(serializedContent);
             var deserializedConnectionInfo = deserializedModel.GetRecursiveChildList().First(node => node.Name == originalConnectionInfo.Name);
             Assert.That(deserializedConnectionInfo.Description, Is.EqualTo(originalConnectionInfo.Description));
@@ -84,13 +83,26 @@ namespace mRemoteNGTests.IntegrationTests
                 new SaveFilter());
             _serializer = new XmlConnectionsSerializer(cryptoProvider, nodeSerializer);
             var serializedContent = _serializer.Serialize(_originalModel);
-            _deserializer = new XmlConnectionsDeserializer();
             var deserializedModel = _deserializer.Deserialize(serializedContent);
             var nodeNamesFromDeserializedModel = deserializedModel.GetRecursiveChildList().Select(node => node.Name);
             var nodeNamesFromOriginalModel = _originalModel.GetRecursiveChildList().Select(node => node.Name);
             Assert.That(nodeNamesFromDeserializedModel, Is.EquivalentTo(nodeNamesFromOriginalModel));
         }
 
+        [Test]
+        public void GuidCreatedIfNonExistedInXml()
+        {
+            var originalConnectionInfo = new ConnectionInfo { Name = "con1" };
+            var serializedContent = _serializer.Serialize(originalConnectionInfo);
+
+            // remove GUID from connection xml
+            serializedContent = serializedContent.Replace(originalConnectionInfo.ConstantID, "");
+
+            var deserializedModel = _deserializer.Deserialize(serializedContent);
+            var deserializedConnectionInfo = deserializedModel.GetRecursiveChildList().First(node => node.Name == originalConnectionInfo.Name);
+            Assert.That(Guid.TryParse(deserializedConnectionInfo.ConstantID, out var guid));
+        }
+
 
         private ConnectionTreeModel SetupConnectionTreeModel()
         {

mRemoteNGTests/Properties/Resources.Designer.cs

@@ -298,6 +298,58 @@ namespace mRemoteNGTests.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to &lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-8&quot;?&gt;
+        ///&lt;RDCMan programVersion=&quot;2.7&quot; schemaVersion=&quot;3&quot;&gt;
+        ///  &lt;file&gt;
+        ///    &lt;credentialsProfiles /&gt;
+        ///    &lt;properties&gt;
+        ///      &lt;expanded&gt;True&lt;/expanded&gt;
+        ///      &lt;name&gt;test_RDCMan_connections&lt;/name&gt;
+        ///    &lt;/properties&gt;
+        ///    &lt;smartGroup&gt;
+        ///      &lt;properties&gt;
+        ///        &lt;expanded&gt;False&lt;/expanded&gt;
+        ///        &lt;name&gt;AllServers&lt;/name&gt;
+        ///      &lt;/properties&gt;
+        ///      &lt;ruleGroup operator=&quot;All&quot;&gt;
+        ///        &lt;rule&gt;
+        ///          &lt;property&gt;DisplayName&lt;/property&gt;
+        ///          &lt;operator&gt;Matches&lt;/operator&gt;
+        ///         [rest of string was truncated]&quot;;.
+        /// </summary>
+        internal static string test_rdcman_v2_7_schema3_empty_values {
+            get {
+                return ResourceManager.GetString("test_rdcman_v2_7_schema3_empty_values", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to &lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-8&quot;?&gt;
+        ///&lt;RDCMan programVersion=&quot;2.7&quot; schemaVersion=&quot;3&quot;&gt;
+        ///  &lt;file&gt;
+        ///    &lt;credentialsProfiles /&gt;
+        ///    &lt;properties&gt;
+        ///      &lt;expanded&gt;True&lt;/expanded&gt;
+        ///      &lt;name&gt;test_RDCMan_connections&lt;/name&gt;
+        ///    &lt;/properties&gt;
+        ///    &lt;smartGroup&gt;
+        ///      &lt;properties&gt;
+        ///        &lt;expanded&gt;False&lt;/expanded&gt;
+        ///        &lt;name&gt;AllServers&lt;/name&gt;
+        ///      &lt;/properties&gt;
+        ///      &lt;ruleGroup operator=&quot;All&quot;&gt;
+        ///        &lt;rule&gt;
+        ///          &lt;property&gt;DisplayName&lt;/property&gt;
+        ///          &lt;operator&gt;Matches&lt;/operator&gt;
+        ///         [rest of string was truncated]&quot;;.
+        /// </summary>
+        internal static string test_rdcman_v2_7_schema3_null_values {
+            get {
+                return ResourceManager.GetString("test_rdcman_v2_7_schema3_null_values", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to screen mode id:i:1
         ///use multimon:i:0

mRemoteNGTests/Properties/Resources.resx

@@ -172,6 +172,12 @@
   <data name="test_rdcman_v2_7_schema3" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\test_RDCMan_v2_7_schema3.rdg;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
   </data>
+  <data name="test_rdcman_v2_7_schema3_empty_values" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\test_rdcman_v2_7_schema3_empty_values.rdg;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
+  </data>
+  <data name="test_rdcman_v2_7_schema3_null_values" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\test_rdcman_v2_7_schema3_null_values.rdg;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
+  </data>
   <data name="test_remotedesktopconnection_rdp" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\test_remotedesktopconnection.rdp;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-16</value>
   </data>

mRemoteNGTests/Resources/test_rdcman_v2_7_schema3_empty_values.rdg

@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RDCMan programVersion="2.7" schemaVersion="3">
+  <file>
+    <credentialsProfiles />
+    <properties>
+      <expanded>True</expanded>
+      <name>test_RDCMan_connections</name>
+    </properties>
+    <smartGroup>
+      <properties>
+        <expanded>False</expanded>
+        <name>AllServers</name>
+      </properties>
+      <ruleGroup operator="All">
+        <rule>
+          <property>DisplayName</property>
+          <operator>Matches</operator>
+          <value>server</value>
+        </rule>
+      </ruleGroup>
+    </smartGroup>
+    <group>
+      <properties>
+        <expanded>True</expanded>
+        <name>Group1</name>
+      </properties>
+      <server>
+        <properties>
+          <displayName></displayName>
+          <name></name>
+          <comment></comment>
+        </properties>
+        <logonCredentials inherit="None">
+          <profileName scope="Local"></profileName>
+          <userName></userName>
+          <password></password>
+          <domain></domain>
+        </logonCredentials>
+        <connectionSettings inherit="None">
+          <connectToConsole></connectToConsole>
+          <startProgram />
+          <workingDir />
+          <port></port>
+          <loadBalanceInfo />
+        </connectionSettings>
+        <gatewaySettings inherit="None">
+          <enabled></enabled>
+          <hostName></hostName>
+          <logonMethod></logonMethod>
+          <localBypass></localBypass>
+          <credSharing></credSharing>
+          <profileName scope="Local"></profileName>
+          <userName></userName>
+          <password />
+          <domain></domain>
+        </gatewaySettings>
+        <remoteDesktop inherit="None">
+          <sameSizeAsClientArea></sameSizeAsClientArea>
+          <fullScreen></fullScreen>
+          <colorDepth></colorDepth>
+        </remoteDesktop>
+        <localResources inherit="None">
+          <audioRedirection></audioRedirection>
+          <audioRedirectionQuality></audioRedirectionQuality>
+          <audioCaptureRedirection></audioCaptureRedirection>
+          <keyboardHook></keyboardHook>
+          <redirectClipboard></redirectClipboard>
+          <redirectDrives></redirectDrives>
+          <redirectDrivesList>
+            <item></item>
+            <item></item>
+            <item></item>
+            <item></item>
+            <item></item>
+          </redirectDrivesList>
+          <redirectPrinters></redirectPrinters>
+          <redirectPorts></redirectPorts>
+          <redirectSmartCards></redirectSmartCards>
+          <redirectPnpDevices></redirectPnpDevices>
+        </localResources>
+        <displaySettings inherit="None">
+          <thumbnailScale></thumbnailScale>
+          <smartSizeDockedWindows></smartSizeDockedWindows>
+          <smartSizeUndockedWindows></smartSizeUndockedWindows>
+        </displaySettings>
+        <securitySettings inherit="None">
+          <authentication></authentication>
+        </securitySettings>
+      </server>
+    </group>
+  </file>
+  <connected />
+  <favorites />
+  <recentlyUsed />
+</RDCMan>

mRemoteNGTests/Resources/test_rdcman_v2_7_schema3_null_values.rdg

@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RDCMan programVersion="2.7" schemaVersion="3">
+  <file>
+    <credentialsProfiles />
+    <properties>
+      <expanded>True</expanded>
+      <name>test_RDCMan_connections</name>
+    </properties>
+    <smartGroup>
+      <properties>
+        <expanded>False</expanded>
+        <name>AllServers</name>
+      </properties>
+      <ruleGroup operator="All">
+        <rule>
+          <property>DisplayName</property>
+          <operator>Matches</operator>
+          <value>server</value>
+        </rule>
+      </ruleGroup>
+    </smartGroup>
+    <group>
+      <properties>
+        <expanded>True</expanded>
+        <name>Group1</name>
+      </properties>
+      <server>
+        <properties>
+        </properties>
+        <logonCredentials inherit="None">
+        </logonCredentials>
+        <connectionSettings inherit="None">
+        </connectionSettings>
+        <gatewaySettings inherit="None">
+        </gatewaySettings>
+        <remoteDesktop inherit="None">
+        </remoteDesktop>
+        <localResources inherit="None">
+        </localResources>
+        <displaySettings inherit="None">
+        </displaySettings>
+        <securitySettings inherit="None">
+        </securitySettings>
+      </server>
+    </group>
+  </file>
+  <connected />
+  <favorites />
+  <recentlyUsed />
+</RDCMan>

mRemoteNGTests/TestHelpers/FileTestHelpers.cs

@@ -1,4 +1,5 @@
 using System.IO;
+using mRemoteNG.Tools;
 
 namespace mRemoteNGTests.TestHelpers
 {
@@ -18,9 +19,17 @@ namespace mRemoteNGTests.TestHelpers
                     File.Delete(file);
         }
 
-        public static string NewTempFilePath()
+        public static void DeleteDirectory(string directory)
+        {
+			if (Directory.Exists(directory))
+				Directory.Delete(directory, true);
+        }
+
+        public static string NewTempFilePath(string extension = "")
         {
             var newPath = Path.Combine(GetTestSpecificTempDirectory(), Path.GetRandomFileName());
+            if (!string.IsNullOrWhiteSpace(extension))
+	            newPath = newPath + extension;
             var folderPath = Path.GetDirectoryName(newPath);
             if (!Directory.Exists(folderPath))
                 Directory.CreateDirectory(folderPath);
@@ -35,5 +44,15 @@ namespace mRemoteNGTests.TestHelpers
         {
             return Path.Combine(Path.GetTempPath(), "mRemoteNGTests", Path.GetRandomFileName());
         }
+
+		public static DisposableAction DisposableTempFile(out string filePath, string extension = "")
+		{
+			var file = NewTempFilePath(extension);
+			filePath = file;
+			File.AppendAllText(file, "");
+			return new DisposableAction(
+				() => {}, 
+				() => DeleteDirectory(Path.GetDirectoryName(file)));
+		}
     }
 }

mRemoteNGTests/Tools/DisposableActionTests.cs

@@ -0,0 +1,42 @@
+using mRemoteNG.Tools;
+using NUnit.Framework;
+
+namespace mRemoteNGTests.Tools
+{
+	public class DisposableActionTests
+	{
+		[Test]
+		public void InitializerActionRunsWhenObjectIsCreated()
+		{
+			var initializerRan = false;
+			new DisposableAction(() => initializerRan = true, () => { });
+
+			Assert.That(initializerRan);
+		}
+
+		[Test]
+		public void DisposalActionRunsWhenDisposeIsCalled()
+		{
+			var disposeActionRan = false;
+			var action = new DisposableAction(() => {}, () => disposeActionRan = true);
+
+			Assert.That(disposeActionRan, Is.False);
+			action.Dispose();
+			Assert.That(disposeActionRan, Is.True);
+		}
+
+		[Test]
+		public void DisposeActionOnlyExecutedOnceWhenCallingDisposeMultipleTimes()
+		{
+			var invokeCount = 0;
+			var action = new DisposableAction(() => { }, () => invokeCount++);
+
+			action.Dispose();
+			action.Dispose();
+			action.Dispose();
+			action.Dispose();
+			action.Dispose();
+			Assert.That(invokeCount, Is.EqualTo(1));
+		}
+	}
+}

mRemoteNGTests/mRemoteNGTests.csproj

@@ -17,6 +17,8 @@
     <IsCodedUITest>False</IsCodedUITest>
     <TestProjectType>UnitTest</TestProjectType>
     <TargetFrameworkProfile />
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <DebugSymbols>true</DebugSymbols>
@@ -108,6 +110,7 @@
     </Otherwise>
   </Choose>
   <ItemGroup>
+    <Compile Include="App\ImportTests.cs" />
     <Compile Include="App\UpdaterTests.cs" />
     <Compile Include="BinaryFileTests.cs" />
     <Compile Include="Config\Connections\Multiuser\ConnectionsUpdateAvailableEventArgsTests.cs" />
@@ -175,6 +178,7 @@
     <Compile Include="Security\XmlCryptoProviderBuilderTests.cs" />
     <Compile Include="TestHelpers\FileTestHelpers.cs" />
     <Compile Include="TestHelpers\SerializableConnectionInfoAllPropertiesOfType.cs" />
+    <Compile Include="Tools\DisposableActionTests.cs" />
     <Compile Include="Tools\ExternalToolsArgumentParserTests.cs" />
     <Compile Include="Tools\FullyObservableCollectionTests.cs" />
     <Compile Include="Tools\OptionalTests.cs" />
@@ -265,6 +269,8 @@
     <None Include="Resources\test_rdcman_v2_2_badschemaversion.rdg" />
     <None Include="Resources\test_rdcman_v2_2_schema1.rdg" />
     <None Include="Resources\test_RDCMan_v2_7_schema3.rdg" />
+    <None Include="Resources\test_rdcman_v2_7_schema3_empty_values.rdg" />
+    <None Include="Resources\test_rdcman_v2_7_schema3_null_values.rdg" />
     <None Include="Resources\test_remotedesktopconnection.rdp" />
   </ItemGroup>
   <ItemGroup>

mRemoteV1.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27130.2010
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.29613.14
 MinimumVisualStudioVersion = 14.0.25420.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "mRemoteV1", "mRemoteV1\mRemoteV1.csproj", "{4934A491-40BC-4E5B-9166-EA1169A220F6}"
 EndProject
@@ -61,7 +61,6 @@ Global
 		{1453B37F-8621-499E-B0B2-6091F76DC0BB}.Debug|x86.ActiveCfg = Debug|x86
 		{1453B37F-8621-499E-B0B2-6091F76DC0BB}.Debug|x86.Build.0 = Debug|x86
 		{1453B37F-8621-499E-B0B2-6091F76DC0BB}.Release Installer|Any CPU.ActiveCfg = Release|x86
-		{1453B37F-8621-499E-B0B2-6091F76DC0BB}.Release Installer|Any CPU.Build.0 = Release|x86
 		{1453B37F-8621-499E-B0B2-6091F76DC0BB}.Release Installer|x86.ActiveCfg = Release|x86
 		{1453B37F-8621-499E-B0B2-6091F76DC0BB}.Release Installer|x86.Build.0 = Release|x86
 		{1453B37F-8621-499E-B0B2-6091F76DC0BB}.Release Portable|Any CPU.ActiveCfg = Release Portable|x86
@@ -106,7 +105,6 @@ Global
 		{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Release Installer|Any CPU.ActiveCfg = Release|Any CPU
-		{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Release Installer|Any CPU.Build.0 = Release|Any CPU
 		{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Release Installer|x86.ActiveCfg = Release|Any CPU
 		{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Release Installer|x86.Build.0 = Release|Any CPU
 		{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Release Portable|Any CPU.ActiveCfg = Release|Any CPU

mRemoteV1/App/CompatibilityChecker.cs

@@ -19,13 +19,29 @@ namespace mRemoteNG.App
 
         private static void CheckFipsPolicy(MessageCollector messageCollector)
         {
+            if (Settings.Default.OverrideFIPSCheck)
+            {
+                messageCollector.AddMessage(MessageClass.InformationMsg, "OverrideFIPSCheck is set. Will skip check...", true);
+                return;
+            }
+
             messageCollector.AddMessage(MessageClass.InformationMsg, "Checking FIPS Policy...", true);
             if (!FipsPolicyEnabledForServer2003() && !FipsPolicyEnabledForServer2008AndNewer()) return;
-            var errorText = string.Format(Language.strErrorFipsPolicyIncompatible, GeneralAppInfo.ProductName,
-                GeneralAppInfo.ProductName, MessageBoxButtons.OK, MessageBoxIcon.Error);
+
+            var errorText = string.Format(Language.strErrorFipsPolicyIncompatible, GeneralAppInfo.ProductName);
             messageCollector.AddMessage(MessageClass.ErrorMsg, errorText, true);
-            MessageBox.Show(FrmMain.Default, errorText);
-            Environment.Exit(1);
+
+            var ShouldIStayOrShouldIGo = CTaskDialog.MessageBox(Application.ProductName, Language.strCompatibilityProblemDetected, errorText, "", "", Language.strCheckboxDoNotShowThisMessageAgain, ETaskDialogButtons.OkCancel, ESysIcons.Warning, ESysIcons.Warning);
+            if (CTaskDialog.VerificationChecked && ShouldIStayOrShouldIGo == DialogResult.OK)
+            {
+                messageCollector.AddMessage(MessageClass.ErrorMsg, "User requests that FIPS check be overridden", true);
+                Settings.Default.OverrideFIPSCheck = true;
+                Settings.Default.Save();
+                return;
+            }
+
+            if (ShouldIStayOrShouldIGo == DialogResult.Cancel)
+                Environment.Exit(1);
         }
 
         private static bool FipsPolicyEnabledForServer2003()

mRemoteV1/App/Import.cs

@@ -3,13 +3,14 @@ using System.Collections.Generic;
 using System.IO;
 using System.Windows.Forms;
 using mRemoteNG.Config.Import;
+using mRemoteNG.Connection;
 using mRemoteNG.Connection.Protocol;
 using mRemoteNG.Container;
 using mRemoteNG.Tools;
 
 namespace mRemoteNG.App
 {
-    public static class Import
+	public static class Import
     {
         public static void ImportFromFile(ContainerInfo importDestinationContainer)
         {
@@ -35,22 +36,12 @@ namespace mRemoteNG.App
                     if (openFileDialog.ShowDialog() != DialogResult.OK)
                         return;
 
-                    foreach (var fileName in openFileDialog.FileNames)
-                    {
-                        try
-                        {
-                            var importer = BuildConnectionImporterFromFileExtension(fileName);
-                            importer.Import(fileName, importDestinationContainer);
-                        }
-                        catch (Exception ex)
-                        {
-                            MessageBox.Show(string.Format(Language.strImportFileFailedContent, fileName), Language.strImportFileFailedMainInstruction,
-                                            MessageBoxButtons.OK, MessageBoxIcon.Exclamation, MessageBoxDefaultButton.Button1);
-                            Runtime.MessageCollector.AddExceptionMessage("Unable to import file.", ex);
-                        }
-                    }
-
-                    Runtime.ConnectionsService.SaveConnectionsAsync();
+					HeadlessFileImport(
+						openFileDialog.FileNames, 
+						importDestinationContainer, 
+						Runtime.ConnectionsService,
+						fileName => MessageBox.Show(string.Format(Language.strImportFileFailedContent, fileName), Language.strImportFileFailedMainInstruction,
+							MessageBoxButtons.OK, MessageBoxIcon.Exclamation, MessageBoxDefaultButton.Button1));
                 }
             }
             catch (Exception ex)
@@ -59,12 +50,38 @@ namespace mRemoteNG.App
             }
         }
 
+        public static void HeadlessFileImport(
+	        IEnumerable<string> filePaths, 
+	        ContainerInfo importDestinationContainer, 
+	        ConnectionsService connectionsService,
+	        Action<string> exceptionAction = null)
+        {
+	        using (connectionsService.BatchedSavingContext())
+	        {
+		        foreach (var fileName in filePaths)
+		        {
+			        try
+			        {
+				        var importer = BuildConnectionImporterFromFileExtension(fileName);
+				        importer.Import(fileName, importDestinationContainer);
+			        }
+			        catch (Exception ex)
+			        {
+				        exceptionAction?.Invoke(fileName);
+				        Runtime.MessageCollector.AddExceptionMessage($"Error occurred while importing file '{fileName}'.", ex);
+			        }
+		        }
+	        }
+		}
+
         public static void ImportFromActiveDirectory(string ldapPath, ContainerInfo importDestinationContainer, bool importSubOu)
         {
             try
             {
-                ActiveDirectoryImporter.Import(ldapPath, importDestinationContainer, importSubOu);
-                Runtime.ConnectionsService.SaveConnectionsAsync();
+	            using (Runtime.ConnectionsService.BatchedSavingContext())
+	            {
+					ActiveDirectoryImporter.Import(ldapPath, importDestinationContainer, importSubOu);
+	            }
             }
             catch (Exception ex)
             {
@@ -76,9 +93,11 @@ namespace mRemoteNG.App
         {
             try
             {
-                var importer = new PortScanImporter(protocol);
-                importer.Import(hosts, importDestinationContainer);
-                Runtime.ConnectionsService.SaveConnectionsAsync();
+	            using (Runtime.ConnectionsService.BatchedSavingContext())
+	            {
+					var importer = new PortScanImporter(protocol);
+					importer.Import(hosts, importDestinationContainer);
+	            }
             }
             catch (Exception ex)
             {

mRemoteV1/App/Info/SettingsFileInfo.cs

@@ -2,14 +2,15 @@
 using System.IO;
 using System.Reflection;
 using System.Windows.Forms;
+using mRemoteNG.Connection;
 
 namespace mRemoteNG.App.Info
 {
     public static class SettingsFileInfo
     {
-        private static readonly string ExePath = Path.GetDirectoryName(Assembly.GetEntryAssembly()?.Location);
+        private static readonly string ExePath = Path.GetDirectoryName(Assembly.GetAssembly(typeof(ConnectionInfo))?.Location);
 
-        public static string SettingsPath { get; } = Runtime.IsPortableEdition ? ExePath : Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\" + Application.ProductName;
+        public static string SettingsPath => Runtime.IsPortableEdition ? ExePath : Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\" + Application.ProductName;
         public static string LayoutFileName { get; } = "pnlLayout.xml";
         public static string ExtAppsFilesName { get; } = "extApps.xml";
         public static string ThemesFileName { get; } = "Themes.xml";

mRemoteV1/App/Runtime.cs

@@ -1,8 +1,3 @@
-using System;
-using System.IO;
-using System.Security;
-using System.Threading;
-using System.Windows.Forms;
 using mRemoteNG.App.Info;
 using mRemoteNG.Config.Putty;
 using mRemoteNG.Connection;
@@ -15,6 +10,11 @@ using mRemoteNG.Tree.Root;
 using mRemoteNG.UI;
 using mRemoteNG.UI.Forms;
 using mRemoteNG.UI.TaskDialog;
+using System;
+using System.IO;
+using System.Security;
+using System.Threading;
+using System.Windows.Forms;
 
 namespace mRemoteNG.App
 {
@@ -43,19 +43,23 @@ namespace mRemoteNG.App
         #region Connections Loading/Saving
         public static void LoadConnectionsAsync()
         {
-            _withDialog = false;
-
             var t = new Thread(LoadConnectionsBGd);
             t.SetApartmentState(ApartmentState.STA);
             t.Start();
         }
 
-        private static bool _withDialog;
         private static void LoadConnectionsBGd()
         {
-            LoadConnections(_withDialog);
+            LoadConnections();
         }
 
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="withDialog">
+        /// Should we show the file selection dialog to allow the user to select
+        /// a connection file
+        /// </param>
         public static void LoadConnections(bool withDialog = false)
         {
             var connectionFileName = "";
@@ -65,18 +69,19 @@ namespace mRemoteNG.App
                 // disable sql update checking while we are loading updates
                 ConnectionsService.RemoteConnectionsSyncronizer?.Disable();
 
-                if (!Settings.Default.UseSQLServer)
+                if (withDialog)
                 {
-                    if (withDialog)
-                    {
-                        var loadDialog = DialogFactory.BuildLoadConnectionsDialog();
-                        if (loadDialog.ShowDialog() != DialogResult.OK) return;
-                        connectionFileName = loadDialog.FileName;
-                    }
-                    else
-                    {
-                        connectionFileName = ConnectionsService.GetStartupConnectionFileName();
-                    }
+                    var loadDialog = DialogFactory.BuildLoadConnectionsDialog();
+                    if (loadDialog.ShowDialog() != DialogResult.OK)
+                        return;
+
+                    connectionFileName = loadDialog.FileName;
+                    Settings.Default.UseSQLServer = false;
+                    Settings.Default.Save();
+                }
+                else if (!Settings.Default.UseSQLServer)
+                {
+                    connectionFileName = ConnectionsService.GetStartupConnectionFileName();
                 }
 
                 ConnectionsService.LoadConnections(Settings.Default.UseSQLServer, false, connectionFileName);

mRemoteV1/Config/Connections/CsvConnectionsSaver.cs

@@ -24,7 +24,7 @@ namespace mRemoteNG.Config.Connections
             _saveFilter = saveFilter;
         }
 
-        public void Save(ConnectionTreeModel connectionTreeModel)
+        public void Save(ConnectionTreeModel connectionTreeModel, string propertyNameTrigger = "")
         {
             var csvConnectionsSerializer = new CsvConnectionsSerializerMremotengFormat(_saveFilter, Runtime.CredentialProviderCatalog);
             var dataProvider = new FileDataProvider(_connectionFileName);

mRemoteV1/Config/Connections/IConnectionsLoader.cs

@@ -0,0 +1,9 @@
+using mRemoteNG.Tree;
+
+namespace mRemoteNG.Config.Connections
+{
+    public interface IConnectionsLoader
+    {
+        ConnectionTreeModel Load();
+    }
+}

mRemoteV1/Config/Connections/Multiuser/RemoteConnectionsSyncronizer.cs

@@ -1,6 +1,7 @@
-using System;
+using mRemoteNG.App;
+using System;
 using System.Timers;
-using mRemoteNG.App;
+
 // ReSharper disable ArrangeAccessorOwnerBody
 
 namespace mRemoteNG.Config.Connections.Multiuser

mRemoteV1/Config/Connections/Multiuser/SqlConnectionsUpdateChecker.cs

@@ -1,11 +1,11 @@
 using mRemoteNG.App;
+using mRemoteNG.Config.Connections.Multiuser;
+using mRemoteNG.Config.DatabaseConnectors;
 using mRemoteNG.Messages;
 using System;
 using System.Data;
 using System.Data.SqlClient;
 using System.Threading;
-using mRemoteNG.Config.Connections.Multiuser;
-using mRemoteNG.Config.DatabaseConnectors;
 
 namespace mRemoteNG.Config.Connections
 {
@@ -13,7 +13,7 @@ namespace mRemoteNG.Config.Connections
     {
         private readonly SqlDatabaseConnector _sqlConnector;
         private readonly SqlCommand _sqlQuery;
-        private DateTime _lastUpdateTime;
+        private DateTime LastUpdateTime => Runtime.ConnectionsService.LastSqlUpdate;
         private DateTime _lastDatabaseUpdateTime;
 
 
@@ -21,7 +21,6 @@ namespace mRemoteNG.Config.Connections
         {
             _sqlConnector = DatabaseConnectorFactory.SqlDatabaseConnectorFromSettings();
             _sqlQuery = new SqlCommand("SELECT * FROM tblUpdate", _sqlConnector.SqlConnection);
-            _lastUpdateTime = default(DateTime);
             _lastDatabaseUpdateTime = default(DateTime);
         }
 
@@ -58,14 +57,14 @@ namespace mRemoteNG.Config.Connections
         private bool DatabaseIsMoreUpToDateThanUs()
         {
             var lastUpdateInDb = GetLastUpdateTimeFromDbResponse();
-            var IAmTheLastoneUpdated = CheckIfIAmTheLastOneUpdated(lastUpdateInDb);
-            return (lastUpdateInDb > _lastUpdateTime && !IAmTheLastoneUpdated);
+            var amTheLastoneUpdated = CheckIfIAmTheLastOneUpdated(lastUpdateInDb);
+            return (lastUpdateInDb > LastUpdateTime && !amTheLastoneUpdated);
         }
 
         private bool CheckIfIAmTheLastOneUpdated(DateTime lastUpdateInDb)
         {
-            DateTime LastSqlUpdateWithoutMilliseconds = new DateTime(Runtime.ConnectionsService.LastSqlUpdate.Ticks - (Runtime.ConnectionsService.LastSqlUpdate.Ticks % TimeSpan.TicksPerSecond), Runtime.ConnectionsService.LastSqlUpdate.Kind);
-            return lastUpdateInDb == LastSqlUpdateWithoutMilliseconds;
+            DateTime lastSqlUpdateWithoutMilliseconds = new DateTime(LastUpdateTime.Ticks - (LastUpdateTime.Ticks % TimeSpan.TicksPerSecond), LastUpdateTime.Kind);
+            return lastUpdateInDb == lastSqlUpdateWithoutMilliseconds;
         }
 
         private DateTime GetLastUpdateTimeFromDbResponse()
@@ -104,10 +103,9 @@ namespace mRemoteNG.Config.Connections
         public event ConnectionsUpdateAvailableEventHandler ConnectionsUpdateAvailable;
         private void RaiseConnectionsUpdateAvailableEvent()
         {
+            Runtime.MessageCollector.AddMessage(MessageClass.DebugMsg, "Remote connection update is available");
             var args = new ConnectionsUpdateAvailableEventArgs(_sqlConnector, _lastDatabaseUpdateTime);
             ConnectionsUpdateAvailable?.Invoke(this, args);
-            if(args.Handled)
-                _lastUpdateTime = _lastDatabaseUpdateTime;
         }
 
         public void Dispose()

mRemoteV1/Config/Connections/SaveConnectionsOnEdit.cs

@@ -2,6 +2,7 @@
 using System.Collections.Specialized;
 using System.ComponentModel;
 using mRemoteNG.Connection;
+using mRemoteNG.UI.Forms;
 
 namespace mRemoteNG.Config.Connections
 {
@@ -32,7 +33,7 @@ namespace mRemoteNG.Config.Connections
 
         private void ConnectionTreeModelOnPropertyChanged(object sender, PropertyChangedEventArgs propertyChangedEventArgs)
         {
-            SaveConnectionOnEdit();
+            SaveConnectionOnEdit(propertyChangedEventArgs.PropertyName);
         }
 
         private void ConnectionTreeModelOnCollectionChanged(object sender, NotifyCollectionChangedEventArgs notifyCollectionChangedEventArgs)
@@ -40,12 +41,14 @@ namespace mRemoteNG.Config.Connections
             SaveConnectionOnEdit();
         }
 
-        private void SaveConnectionOnEdit()
+        private void SaveConnectionOnEdit(string propertyName = "")
         {
             if (!mRemoteNG.Settings.Default.SaveConnectionsAfterEveryEdit)
                 return;
+            if (FrmMain.Default.IsClosing)
+                return;
 
-            _connectionsService.SaveConnectionsAsync();
+            _connectionsService.SaveConnectionsAsync(propertyName);
         }
     }
 }

mRemoteV1/Config/Connections/SqlConnectionsLoader.cs

@@ -1,22 +1,96 @@
-using mRemoteNG.Config.DatabaseConnectors;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Security;
+using mRemoteNG.Config.DatabaseConnectors;
 using mRemoteNG.Config.DataProviders;
 using mRemoteNG.Config.Serializers;
+using mRemoteNG.Config.Serializers.MsSql;
 using mRemoteNG.Config.Serializers.Versioning;
+using mRemoteNG.Container;
+using mRemoteNG.Security;
+using mRemoteNG.Security.Authentication;
+using mRemoteNG.Security.SymmetricEncryption;
+using mRemoteNG.Tools;
 using mRemoteNG.Tree;
+using mRemoteNG.Tree.Root;
 
 namespace mRemoteNG.Config.Connections
 {
-    public class SqlConnectionsLoader
+	public class SqlConnectionsLoader : IConnectionsLoader
     {
+        private readonly IDeserializer<string, IEnumerable<LocalConnectionPropertiesModel>> _localConnectionPropertiesDeserializer;
+        private readonly IDataProvider<string> _dataProvider;
+
+        public Func<Optional<SecureString>> AuthenticationRequestor { get; set; } =
+            () => MiscTools.PasswordDialog("", false);
+
+        public SqlConnectionsLoader(
+            IDeserializer<string, IEnumerable<LocalConnectionPropertiesModel>> localConnectionPropertiesDeserializer, 
+            IDataProvider<string> dataProvider)
+        {
+            _localConnectionPropertiesDeserializer = localConnectionPropertiesDeserializer.ThrowIfNull(nameof(localConnectionPropertiesDeserializer));
+            _dataProvider = dataProvider.ThrowIfNull(nameof(dataProvider));
+        }
+
         public ConnectionTreeModel Load()
         {
             var connector = DatabaseConnectorFactory.SqlDatabaseConnectorFromSettings();
             var dataProvider = new SqlDataProvider(connector);
+            var metaDataRetriever = new SqlDatabaseMetaDataRetriever();
             var databaseVersionVerifier = new SqlDatabaseVersionVerifier(connector);
-            databaseVersionVerifier.VerifyDatabaseVersion();
+            var cryptoProvider = new LegacyRijndaelCryptographyProvider();
+
+            var metaData = metaDataRetriever.GetDatabaseMetaData(connector) ?? 
+                           HandleFirstRun(metaDataRetriever, connector);
+            var decryptionKey = GetDecryptionKey(metaData);
+
+            if (!decryptionKey.Any())
+                throw new Exception("Could not load SQL connections");
+
+            databaseVersionVerifier.VerifyDatabaseVersion(metaData.ConfVersion);
             var dataTable = dataProvider.Load();
-            var deserializer = new DataTableDeserializer();
-            return deserializer.Deserialize(dataTable);
+            var deserializer = new DataTableDeserializer(cryptoProvider, decryptionKey.First());
+            var connectionTree = deserializer.Deserialize(dataTable);
+            ApplyLocalConnectionProperties(connectionTree.RootNodes.First(i => i is RootNodeInfo));
+            return connectionTree;
         }
+
+        private Optional<SecureString> GetDecryptionKey(SqlConnectionListMetaData metaData)
+        {
+            var cryptographyProvider = new LegacyRijndaelCryptographyProvider();
+            var cipherText = metaData.Protected;
+            var authenticator = new PasswordAuthenticator(cryptographyProvider, cipherText, AuthenticationRequestor);
+            var authenticated = authenticator.Authenticate(new RootNodeInfo(RootNodeType.Connection).DefaultPassword.ConvertToSecureString());
+
+            if (authenticated)
+                return authenticator.LastAuthenticatedPassword;
+            return Optional<SecureString>.Empty;
+        }
+
+        private void ApplyLocalConnectionProperties(ContainerInfo rootNode)
+        {
+            var localPropertiesXml = _dataProvider.Load();
+            var localConnectionProperties = _localConnectionPropertiesDeserializer.Deserialize(localPropertiesXml);
+
+            rootNode
+                .GetRecursiveChildList()
+                .Join(localConnectionProperties, 
+                    con => con.ConstantID, 
+                    locals => locals.ConnectionId,
+                    (con, locals) => new {Connection = con, LocalProperties = locals})
+                .ForEach(x =>
+                {
+                    x.Connection.PleaseConnect = x.LocalProperties.Connected;
+                    if (x.Connection is ContainerInfo container)
+                        container.IsExpanded = x.LocalProperties.Expanded;
+                });
+        }
+
+        private SqlConnectionListMetaData HandleFirstRun(SqlDatabaseMetaDataRetriever metaDataRetriever, SqlDatabaseConnector connector)
+        {
+	        metaDataRetriever.WriteDatabaseMetaData(new RootNodeInfo(RootNodeType.Connection), connector);
+	        return metaDataRetriever.GetDatabaseMetaData(connector);
+		}
     }
 }

mRemoteV1/Config/Connections/SqlConnectionsSaver.cs

@@ -1,14 +1,16 @@
 using System;
+using System.Collections.Generic;
 using System.Data.SqlClient;
 using System.Globalization;
 using System.Linq;
-using System.Security;
 using mRemoteNG.App;
 using mRemoteNG.App.Info;
 using mRemoteNG.Config.DatabaseConnectors;
 using mRemoteNG.Config.DataProviders;
 using mRemoteNG.Config.Serializers;
+using mRemoteNG.Config.Serializers.MsSql;
 using mRemoteNG.Config.Serializers.Versioning;
+using mRemoteNG.Connection;
 using mRemoteNG.Container;
 using mRemoteNG.Messages;
 using mRemoteNG.Security;
@@ -19,44 +21,90 @@ using mRemoteNG.Tree.Root;
 
 namespace mRemoteNG.Config.Connections
 {
-    public class SqlConnectionsSaver : ISaver<ConnectionTreeModel>
+	public class SqlConnectionsSaver : ISaver<ConnectionTreeModel>
     {
-        private SecureString _password = Runtime.EncryptionKey;
         private readonly SaveFilter _saveFilter;
+        private readonly ISerializer<IEnumerable<LocalConnectionPropertiesModel>, string> _localPropertiesSerializer;
+        private readonly IDataProvider<string> _dataProvider;
 
-        public SqlConnectionsSaver(SaveFilter saveFilter)
+        public SqlConnectionsSaver(
+            SaveFilter saveFilter, 
+            ISerializer<IEnumerable<LocalConnectionPropertiesModel>, string> localPropertieSerializer,
+            IDataProvider<string> localPropertiesDataProvider)
         {
             if (saveFilter == null)
                 throw new ArgumentNullException(nameof(saveFilter));
             _saveFilter = saveFilter;
+            _localPropertiesSerializer = localPropertieSerializer.ThrowIfNull(nameof(localPropertieSerializer));
+            _dataProvider = localPropertiesDataProvider.ThrowIfNull(nameof(localPropertiesDataProvider));
         }
 
-        public void Save(ConnectionTreeModel connectionTreeModel)
+        public void Save(ConnectionTreeModel connectionTreeModel, string propertyNameTrigger = "")
         {
+            var rootTreeNode = connectionTreeModel.RootNodes.OfType<RootNodeInfo>().First();
+
+            UpdateLocalConnectionProperties(rootTreeNode);
+
+            if (PropertyIsLocalOnly(propertyNameTrigger))
+            {
+                Runtime.MessageCollector.AddMessage(MessageClass.DebugMsg, 
+                    $"Property {propertyNameTrigger} is local only. Not saving to database.");
+                return;
+            }
+
             if (SqlUserIsReadOnly())
             {
                 Runtime.MessageCollector.AddMessage(MessageClass.InformationMsg, "Trying to save connection tree but the SQL read only checkbox is checked, aborting!");
                 return;
             }
-                
 
             using (var sqlConnector = DatabaseConnectorFactory.SqlDatabaseConnectorFromSettings())
             {
                 sqlConnector.Connect();
                 var databaseVersionVerifier = new SqlDatabaseVersionVerifier(sqlConnector);
+                var metaDataRetriever = new SqlDatabaseMetaDataRetriever();
+                var metaData = metaDataRetriever.GetDatabaseMetaData(sqlConnector);
 
-                if (!databaseVersionVerifier.VerifyDatabaseVersion())
+                if (!databaseVersionVerifier.VerifyDatabaseVersion(metaData.ConfVersion))
                 {
                     Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg, Language.strErrorConnectionListSaveFailed);
                     return;
                 }
 
-                var rootTreeNode = connectionTreeModel.RootNodes.OfType<RootNodeInfo>().First();
-
-                UpdateRootNodeTable(rootTreeNode, sqlConnector);
+                metaDataRetriever.WriteDatabaseMetaData(rootTreeNode, sqlConnector);
                 UpdateConnectionsTable(rootTreeNode, sqlConnector);
                 UpdateUpdatesTable(sqlConnector);
             }
+
+            Runtime.MessageCollector.AddMessage(MessageClass.DebugMsg, "Saved connections to database");
+        }
+
+        /// <summary>
+        /// Determines if a given property name should be only saved
+        /// locally.
+        /// </summary>
+        /// <param name="property">
+        /// The name of the property that triggered the save event
+        /// </param>
+        /// <returns></returns>
+        private bool PropertyIsLocalOnly(string property)
+        {
+            return property == nameof(ConnectionInfo.OpenConnections) ||
+                   property == nameof(ContainerInfo.IsExpanded);
+        }
+
+        private void UpdateLocalConnectionProperties(ContainerInfo rootNode)
+        {
+            var a = rootNode.GetRecursiveChildList().Select(info => new LocalConnectionPropertiesModel
+            {
+                ConnectionId = info.ConstantID,
+                Connected = info.OpenConnections.Count > 0,
+                Expanded = info is ContainerInfo c && c.IsExpanded
+            });
+
+            var serializedProperties = _localPropertiesSerializer.Serialize(a);
+            _dataProvider.Save(serializedProperties);
+            Runtime.MessageCollector.AddMessage(MessageClass.DebugMsg, "Saved local connection properties");
         }
 
         private void UpdateRootNodeTable(RootNodeInfo rootTreeNode, SqlDatabaseConnector sqlDatabaseConnector)
@@ -67,17 +115,17 @@ namespace mRemoteNG.Config.Connections
             {
                 if (rootTreeNode.Password)
                 {
-                    _password = rootTreeNode.PasswordString.ConvertToSecureString();
-                    strProtected = cryptographyProvider.Encrypt("ThisIsProtected", _password);
+                    var password = rootTreeNode.PasswordString.ConvertToSecureString();
+                    strProtected = cryptographyProvider.Encrypt("ThisIsProtected", password);
                 }
                 else
                 {
-                    strProtected = cryptographyProvider.Encrypt("ThisIsNotProtected", _password);
+                    strProtected = cryptographyProvider.Encrypt("ThisIsNotProtected", Runtime.EncryptionKey);
                 }
             }
             else
             {
-                strProtected = cryptographyProvider.Encrypt("ThisIsNotProtected", _password);
+                strProtected = cryptographyProvider.Encrypt("ThisIsNotProtected", Runtime.EncryptionKey);
             }
 
             var sqlQuery = new SqlCommand("DELETE FROM tblRoot", sqlDatabaseConnector.SqlConnection);
@@ -99,13 +147,15 @@ namespace mRemoteNG.Config.Connections
             }
         }
 
-        private void UpdateConnectionsTable(ContainerInfo rootTreeNode, SqlDatabaseConnector sqlDatabaseConnector)
+        private void UpdateConnectionsTable(RootNodeInfo rootTreeNode, SqlDatabaseConnector sqlDatabaseConnector)
         {
-            var sqlQuery = new SqlCommand("DELETE FROM tblCons", sqlDatabaseConnector.SqlConnection);
-            sqlQuery.ExecuteNonQuery();
-            var serializer = new DataTableSerializer(_saveFilter);
+            var cryptoProvider = new LegacyRijndaelCryptographyProvider();
+            var serializer = new DataTableSerializer(_saveFilter, cryptoProvider, rootTreeNode.PasswordString.ConvertToSecureString());
             var dataTable = serializer.Serialize(rootTreeNode);
             var dataProvider = new SqlDataProvider(sqlDatabaseConnector);
+
+            var sqlQuery = new SqlCommand("DELETE FROM tblCons", sqlDatabaseConnector.SqlConnection);
+            sqlQuery.ExecuteNonQuery();
             dataProvider.Save(dataTable);
         }
 

mRemoteV1/Config/Connections/XmlConnectionsLoader.cs

@@ -1,14 +1,14 @@
-using System;
-using System.IO;
-using System.Security;
-using mRemoteNG.Config.DataProviders;
+using mRemoteNG.Config.DataProviders;
 using mRemoteNG.Config.Serializers.Xml;
 using mRemoteNG.Tools;
 using mRemoteNG.Tree;
+using System;
+using System.IO;
+using System.Security;
 
 namespace mRemoteNG.Config.Connections
 {
-    public class XmlConnectionsLoader
+    public class XmlConnectionsLoader : IConnectionsLoader
     {
         private readonly string _connectionFilePath;
 

mRemoteV1/Config/Connections/XmlConnectionsSaver.cs

@@ -27,7 +27,7 @@ namespace mRemoteNG.Config.Connections
             _saveFilter = saveFilter;
         }
 
-        public void Save(ConnectionTreeModel connectionTreeModel)
+        public void Save(ConnectionTreeModel connectionTreeModel, string propertyNameTrigger = "")
         {
             try
             {

mRemoteV1/Config/CredentialRepositoryListSaver.cs

@@ -18,7 +18,7 @@ namespace mRemoteNG.Config
             _dataProvider = dataProvider;
         }
 
-        public void Save(IEnumerable<ICredentialRepository> repositories)
+        public void Save(IEnumerable<ICredentialRepository> repositories, string propertyNameTrigger = "")
         {
             var serializer = new CredentialRepositoryListSerializer();
             var data = serializer.Serialize(repositories);

mRemoteV1/Config/ISaver.cs

@@ -2,6 +2,6 @@
 {
     public interface ISaver<in T>
     {
-        void Save(T model);
+        void Save(T model, string propertyNameTrigger = "");
     }
 }

mRemoteV1/Config/Putty/PuttySessionsManager.cs

@@ -1,13 +1,13 @@
-using mRemoteNG.Tools;
 using System.Collections.Generic;
 using System.Collections.Specialized;
 using System.ComponentModel;
+using mRemoteNG.Tools;
 using mRemoteNG.Tree.Root;
 // ReSharper disable ArrangeAccessorOwnerBody
 
 namespace mRemoteNG.Config.Putty
 {
-	public class PuttySessionsManager
+    public class PuttySessionsManager
 	{
         public static PuttySessionsManager Instance { get; } = new PuttySessionsManager();
 
@@ -35,10 +35,12 @@ namespace mRemoteNG.Config.Putty
 			}
 		}
 
-	    private void AddSessionsFromProvider(AbstractPuttySessionsProvider provider)
+	    private void AddSessionsFromProvider(AbstractPuttySessionsProvider puttySessionProvider)
 	    {
-            var rootTreeNode = provider.RootInfo;
-	        provider.GetSessions();
+	        puttySessionProvider.ThrowIfNull(nameof(puttySessionProvider));
+
+            var rootTreeNode = puttySessionProvider.RootInfo;
+	        puttySessionProvider.GetSessions();
 
             if (!RootPuttySessionsNodes.Contains(rootTreeNode) && rootTreeNode.HasChildren())
                 RootPuttySessionsNodes.Add(rootTreeNode);

mRemoteV1/Config/Putty/PuttySessionsRegistryProvider.cs

@@ -1,19 +1,19 @@
-using Microsoft.Win32;
-using mRemoteNG.App;
-using mRemoteNG.Connection;
-using mRemoteNG.Connection.Protocol;
-using mRemoteNG.Messages;
 using System;
 using System.Collections.Generic;
 using System.Management;
 using System.Security.Principal;
 using System.Text;
 using System.Web;
+using Microsoft.Win32;
+using mRemoteNG.App;
+using mRemoteNG.Connection;
+using mRemoteNG.Connection.Protocol;
+using mRemoteNG.Messages;
 
 
 namespace mRemoteNG.Config.Putty
 {
-	public class PuttySessionsRegistryProvider : AbstractPuttySessionsProvider
+    public class PuttySessionsRegistryProvider : AbstractPuttySessionsProvider
 	{
         private const string PuttySessionsKey = "Software\\SimonTatham\\PuTTY\\Sessions";
         private static ManagementEventWatcher _eventWatcher;
@@ -39,7 +39,10 @@ namespace mRemoteNG.Config.Putty
 		}
         
         public override PuttySessionInfo GetSession(string sessionName)
-		{
+        {
+            if (string.IsNullOrEmpty(sessionName))
+                return null;
+
             var sessionsKey = Registry.CurrentUser.OpenSubKey(PuttySessionsKey);
             var sessionKey = sessionsKey?.OpenSubKey(sessionName);
 			if (sessionKey == null)	return null;
@@ -50,10 +53,15 @@ namespace mRemoteNG.Config.Putty
 		    {
 		        PuttySession = sessionName,
 		        Name = sessionName,
-		        Hostname = sessionKey.GetValue("HostName").ToString(),
-		        Username = sessionKey.GetValue("UserName").ToString()
+		        Hostname = sessionKey.GetValue("HostName")?.ToString() ?? "",
+		        Username = sessionKey.GetValue("UserName")?.ToString() ?? ""
 		    };
-		    var protocol = string.IsNullOrEmpty(sessionKey.GetValue("Protocol").ToString()) ? sessionKey.GetValue("Protocol").ToString() : "ssh";
+
+
+		    var protocol = string.IsNullOrEmpty(sessionKey.GetValue("Protocol")?.ToString())
+		        ? "ssh"
+                : sessionKey.GetValue("Protocol").ToString();
+
 		    switch (protocol.ToLowerInvariant())
 			{
 				case "raw":
@@ -65,7 +73,7 @@ namespace mRemoteNG.Config.Putty
 				case "serial":
 					return null;
 				case "ssh":
-				    int.TryParse(sessionKey.GetValue("SshProt").ToString(), out var sshVersion);
+				    int.TryParse(sessionKey.GetValue("SshProt")?.ToString(), out var sshVersion);
                     /* Per PUTTY.H in PuTTYNG & PuTTYNG Upstream (PuTTY proper currently)
                      * expect 0 for SSH1, 3 for SSH2 ONLY
                      * 1 for SSH1 with a 2 fallback
@@ -81,7 +89,12 @@ namespace mRemoteNG.Config.Putty
 				default:
 					return null;
 			}
-			sessionInfo.Port = Convert.ToInt32(sessionKey.GetValue("PortNumber"));
+
+            int.TryParse(sessionKey.GetValue("PortNumber")?.ToString(), out var portNumber);
+            if (portNumber == default(int))
+                sessionInfo.SetDefaultPort();
+            else
+                sessionInfo.Port = portNumber;
 				
 			return sessionInfo;
 		}

mRemoteV1/Config/Putty/PuttySessionsXmingProvider.cs

@@ -33,6 +33,7 @@ namespace mRemoteNG.Config.Putty
 			foreach (var sessionName in Directory.GetFiles(sessionsFolderPath))
 			{
 			    var sessionFileName = Path.GetFileName(sessionName);
+			    // ReSharper disable once ConstantConditionalAccessQualifier
 			    sessionNames.Add(raw ? sessionFileName : System.Web.HttpUtility.UrlDecode(sessionFileName?.Replace("+", "%2B")));
 			}
 
@@ -174,7 +175,8 @@ namespace mRemoteNG.Config.Putty
 		private static string GetPuttyConfPath()
 		{
 		    var puttyPath = mRemoteNG.Settings.Default.UseCustomPuttyPath ? mRemoteNG.Settings.Default.CustomPuttyPath : App.Info.GeneralAppInfo.PuttyPath;
-		    return Path.Combine(Path.GetDirectoryName(puttyPath), "putty.conf");
+		    puttyPath = Path.GetDirectoryName(puttyPath);
+            return string.IsNullOrEmpty(puttyPath) ? null : Path.Combine(puttyPath, "putty.conf");
 		}
 			
 		private static string GetSessionsFolderPath()
@@ -201,6 +203,9 @@ namespace mRemoteNG.Config.Putty
 			
 		private static PuttySessionInfo ModifyRegistrySessionInfo(PuttySessionInfo sessionInfo)
 		{
+		    if (sessionInfo == null)
+		        return null;
+
 			sessionInfo.Name = string.Format(RegistrySessionNameFormat, sessionInfo.Name);
 			sessionInfo.PuttySession = string.Format(RegistrySessionNameFormat, sessionInfo.PuttySession);
 			return sessionInfo;

mRemoteV1/Config/Serializers/ConnectionSerializers/MsSql/DataTableDeserializer.cs

@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Linq;
-using mRemoteNG.App;
+using mRemoteNG.App;
 using mRemoteNG.Connection;
 using mRemoteNG.Connection.Protocol;
 using mRemoteNG.Connection.Protocol.Http;
@@ -12,11 +8,28 @@ using mRemoteNG.Connection.Protocol.VNC;
 using mRemoteNG.Container;
 using mRemoteNG.Tree;
 using mRemoteNG.Tree.Root;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Security;
+using mRemoteNG.Security;
+using mRemoteNG.Security.SymmetricEncryption;
+using mRemoteNG.Tools;
 
-namespace mRemoteNG.Config.Serializers
+namespace mRemoteNG.Config.Serializers.MsSql
 {
-	public class DataTableDeserializer : IDeserializer<DataTable, ConnectionTreeModel>
+    public class DataTableDeserializer : IDeserializer<DataTable, ConnectionTreeModel>
     {
+        private readonly ICryptographyProvider _cryptographyProvider;
+        private readonly SecureString _decryptionKey;
+
+        public DataTableDeserializer(ICryptographyProvider cryptographyProvider, SecureString decryptionKey)
+        {
+            _cryptographyProvider = cryptographyProvider.ThrowIfNull(nameof(cryptographyProvider));
+            _decryptionKey = decryptionKey.ThrowIfNull(nameof(decryptionKey));
+        }
+
         public ConnectionTreeModel Deserialize(DataTable table)
         {
             var connectionList = CreateNodesFromTable(table);
@@ -34,10 +47,10 @@ namespace mRemoteNG.Config.Serializers
                 switch ((string)row["Type"])
                 {
                     case "Connection":
-                    nodeList.Add(DeserializeConnectionInfo(row));
+                        nodeList.Add(DeserializeConnectionInfo(row));
                         break;
                     case "Container":
-                    nodeList.Add(DeserializeContainerInfo(row));
+                        nodeList.Add(DeserializeContainerInfo(row));
                         break;
                 }
             }
@@ -68,16 +81,12 @@ namespace mRemoteNG.Config.Serializers
             // The Parent object is linked properly later in CreateNodeHierarchy()
             //connectionInfo.Parent.ConstantID = (string)dataRow["ParentID"];
 
-            var info = connectionInfo as ContainerInfo;
-            if(info != null)
-                info.IsExpanded = (bool)dataRow["Expanded"];
-
             connectionInfo.Description = (string)dataRow["Description"];
             connectionInfo.Icon = (string)dataRow["Icon"];
             connectionInfo.Panel = (string)dataRow["Panel"];
             connectionInfo.Username = (string)dataRow["Username"];
             connectionInfo.Domain = (string)dataRow["DomainName"];
-            connectionInfo.Password = (string)dataRow["Password"];
+            connectionInfo.Password = DecryptValue((string)dataRow["Password"]);
             connectionInfo.Hostname = (string)dataRow["Hostname"];
             connectionInfo.Protocol = (ProtocolType)Enum.Parse(typeof(ProtocolType), (string)dataRow["Protocol"]);
             connectionInfo.PuttySession = (string)dataRow["PuttySession"];
@@ -105,7 +114,6 @@ namespace mRemoteNG.Config.Serializers
             connectionInfo.RedirectSound = (RdpProtocol.RDPSounds)Enum.Parse(typeof(RdpProtocol.RDPSounds), (string)dataRow["RedirectSound"]);
             connectionInfo.SoundQuality = (RdpProtocol.RDPSoundQuality)Enum.Parse(typeof(RdpProtocol.RDPSoundQuality), (string)dataRow["SoundQuality"]);
             connectionInfo.RedirectKeys = (bool)dataRow["RedirectKeys"];
-            connectionInfo.PleaseConnect = (bool)dataRow["Connected"];
             connectionInfo.PreExtApp = (string)dataRow["PreExtApp"];
             connectionInfo.PostExtApp = (string)dataRow["PostExtApp"];
             connectionInfo.MacAddress = (string)dataRow["MacAddress"];
@@ -118,7 +126,7 @@ namespace mRemoteNG.Config.Serializers
             connectionInfo.VNCProxyIP = (string)dataRow["VNCProxyIP"];
             connectionInfo.VNCProxyPort = (int)dataRow["VNCProxyPort"];
             connectionInfo.VNCProxyUsername = (string)dataRow["VNCProxyUsername"];
-            connectionInfo.VNCProxyPassword = (string)dataRow["VNCProxyPassword"];
+            connectionInfo.VNCProxyPassword = DecryptValue((string)dataRow["VNCProxyPassword"]);
             connectionInfo.VNCColors = (ProtocolVNC.Colors)Enum.Parse(typeof(ProtocolVNC.Colors), (string)dataRow["VNCColors"]);
             connectionInfo.VNCSmartSizeMode = (ProtocolVNC.SmartSizeMode)Enum.Parse(typeof(ProtocolVNC.SmartSizeMode), (string)dataRow["VNCSmartSizeMode"]);
             connectionInfo.VNCViewOnly = (bool)dataRow["VNCViewOnly"];
@@ -126,7 +134,7 @@ namespace mRemoteNG.Config.Serializers
             connectionInfo.RDGatewayHostname = (string)dataRow["RDGatewayHostname"];
             connectionInfo.RDGatewayUseConnectionCredentials = (RdpProtocol.RDGatewayUseConnectionCredentials)Enum.Parse(typeof(RdpProtocol.RDGatewayUseConnectionCredentials), (string)dataRow["RDGatewayUseConnectionCredentials"]);
             connectionInfo.RDGatewayUsername = (string)dataRow["RDGatewayUsername"];
-            connectionInfo.RDGatewayPassword = (string)dataRow["RDGatewayPassword"];
+            connectionInfo.RDGatewayPassword = DecryptValue((string)dataRow["RDGatewayPassword"]);
             connectionInfo.RDGatewayDomain = (string)dataRow["RDGatewayDomain"];
 
             connectionInfo.Inheritance.CacheBitmaps = (bool)dataRow["InheritCacheBitmaps"];
@@ -185,10 +193,26 @@ namespace mRemoteNG.Config.Serializers
             connectionInfo.Inheritance.RDGatewayDomain = (bool)dataRow["InheritRDGatewayDomain"];
         }
 
+        private string DecryptValue(string cipherText)
+        {
+            try
+            {
+                return _cryptographyProvider.Decrypt(cipherText, _decryptionKey);
+            }
+            catch (EncryptionException)
+            {
+                // value may not be encrypted
+                return cipherText;
+            }
+        }
+
         private ConnectionTreeModel CreateNodeHierarchy(List<ConnectionInfo> connectionList, DataTable dataTable)
         {
             var connectionTreeModel = new ConnectionTreeModel();
-            var rootNode = new RootNodeInfo(RootNodeType.Connection, "0");
+            var rootNode = new RootNodeInfo(RootNodeType.Connection, "0")
+            {
+                PasswordString = _decryptionKey.ConvertToUnsecureString()
+            };
             connectionTreeModel.AddRootNode(rootNode);
 
             foreach (DataRow row in dataTable.Rows)

mRemoteV1/Config/Serializers/ConnectionSerializers/MsSql/DataTableSerializer.cs

@@ -1,25 +1,31 @@
-using System;
-using System.Data;
-using System.Data.SqlTypes;
-using System.Linq;
-using mRemoteNG.Connection;
+using mRemoteNG.Connection;
 using mRemoteNG.Container;
 using mRemoteNG.Security;
 using mRemoteNG.Tree;
 using mRemoteNG.Tree.Root;
+using System;
+using System.Data;
+using System.Data.SqlTypes;
+using System.Linq;
+using System.Security;
+using mRemoteNG.Tools;
 
-namespace mRemoteNG.Config.Serializers
+namespace mRemoteNG.Config.Serializers.MsSql
 {
     public class DataTableSerializer : ISerializer<ConnectionInfo,DataTable>
     {
+        private readonly ICryptographyProvider _cryptographyProvider;
+        private readonly SecureString _encryptionKey;
         private DataTable _dataTable;
         private const string TableName = "tblCons";
         private readonly SaveFilter _saveFilter;
         private int _currentNodeIndex;
 
-        public DataTableSerializer(SaveFilter saveFilter)
+        public DataTableSerializer(SaveFilter saveFilter, ICryptographyProvider cryptographyProvider, SecureString encryptionKey)
         {
-            _saveFilter = saveFilter;
+            _saveFilter = saveFilter.ThrowIfNull(nameof(saveFilter));
+            _cryptographyProvider = cryptographyProvider.ThrowIfNull(nameof(cryptographyProvider));
+            _encryptionKey = encryptionKey.ThrowIfNull(nameof(encryptionKey));
         }
 
 
@@ -204,14 +210,15 @@ namespace mRemoteNG.Config.Serializers
             dataRow["ParentID"] = connectionInfo.Parent?.ConstantID ?? "";
             dataRow["PositionID"] = _currentNodeIndex;
             dataRow["LastChange"] = (SqlDateTime)DateTime.Now;
-            var info = connectionInfo as ContainerInfo;
-            dataRow["Expanded"] = info != null && info.IsExpanded;
+            dataRow["Expanded"] = false; // TODO: this column can eventually be removed. we now save this property locally
             dataRow["Description"] = connectionInfo.Description;
             dataRow["Icon"] = connectionInfo.Icon;
             dataRow["Panel"] = connectionInfo.Panel;
             dataRow["Username"] = _saveFilter.SaveUsername ? connectionInfo.Username : "";
             dataRow["DomainName"] = _saveFilter.SaveDomain ? connectionInfo.Domain : "";
-            dataRow["Password"] = _saveFilter.SavePassword ? connectionInfo.Password : "";
+            dataRow["Password"] = _saveFilter.SavePassword 
+                ? _cryptographyProvider.Encrypt(connectionInfo.Password, _encryptionKey) 
+                : "";
             dataRow["Hostname"] = connectionInfo.Hostname;
             dataRow["Protocol"] = connectionInfo.Protocol;
             dataRow["PuttySession"] = connectionInfo.PuttySession;
@@ -239,7 +246,7 @@ namespace mRemoteNG.Config.Serializers
             dataRow["RedirectSound"] = connectionInfo.RedirectSound;
             dataRow["SoundQuality"] = connectionInfo.SoundQuality;
             dataRow["RedirectKeys"] = connectionInfo.RedirectKeys;
-            dataRow["Connected"] = connectionInfo.OpenConnections.Count > 0;
+            dataRow["Connected"] = false; // TODO: this column can eventually be removed. we now save this property locally
             dataRow["PreExtApp"] = connectionInfo.PreExtApp;
             dataRow["PostExtApp"] = connectionInfo.PostExtApp;
             dataRow["MacAddress"] = connectionInfo.MacAddress;
@@ -252,7 +259,7 @@ namespace mRemoteNG.Config.Serializers
             dataRow["VNCProxyIP"] = connectionInfo.VNCProxyIP;
             dataRow["VNCProxyPort"] = connectionInfo.VNCProxyPort;
             dataRow["VNCProxyUsername"] = connectionInfo.VNCProxyUsername;
-            dataRow["VNCProxyPassword"] = connectionInfo.VNCProxyPassword;
+            dataRow["VNCProxyPassword"] = _cryptographyProvider.Encrypt(connectionInfo.VNCProxyPassword, _encryptionKey);
             dataRow["VNCColors"] = connectionInfo.VNCColors;
             dataRow["VNCSmartSizeMode"] = connectionInfo.VNCSmartSizeMode;
             dataRow["VNCViewOnly"] = connectionInfo.VNCViewOnly;
@@ -260,7 +267,7 @@ namespace mRemoteNG.Config.Serializers
             dataRow["RDGatewayHostname"] = connectionInfo.RDGatewayHostname;
             dataRow["RDGatewayUseConnectionCredentials"] = connectionInfo.RDGatewayUseConnectionCredentials;
             dataRow["RDGatewayUsername"] = connectionInfo.RDGatewayUsername;
-            dataRow["RDGatewayPassword"] = connectionInfo.RDGatewayPassword;
+            dataRow["RDGatewayPassword"] = _cryptographyProvider.Encrypt(connectionInfo.RDGatewayPassword, _encryptionKey);
             dataRow["RDGatewayDomain"] = connectionInfo.RDGatewayDomain;
             if (_saveFilter.SaveInheritance)
             {

mRemoteV1/Config/Serializers/ConnectionSerializers/MsSql/LocalConnectionPropertiesModel.cs

@@ -0,0 +1,20 @@
+namespace mRemoteNG.Config.Serializers.MsSql
+{
+    public class LocalConnectionPropertiesModel
+    {
+        /// <summary>
+        /// The unique Id of this tree node
+        /// </summary>
+        public string ConnectionId { get; set; }
+
+        /// <summary>
+        /// Indicates whether this connection is connected
+        /// </summary>
+        public bool Connected { get; set; }
+
+        /// <summary>
+        /// Indicates whether this container is expanded in the tree
+        /// </summary>
+        public bool Expanded { get; set; }
+    }
+}

mRemoteV1/Config/Serializers/ConnectionSerializers/MsSql/LocalConnectionPropertiesXmlSerializer.cs

@@ -0,0 +1,60 @@
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Xml;
+using System.Xml.Linq;
+
+namespace mRemoteNG.Config.Serializers.MsSql
+{
+    public class LocalConnectionPropertiesXmlSerializer : 
+        ISerializer<IEnumerable<LocalConnectionPropertiesModel>, string>, 
+        IDeserializer<string, IEnumerable<LocalConnectionPropertiesModel>>
+    {
+        public string Serialize(IEnumerable<LocalConnectionPropertiesModel> models)
+        {
+            var localConnections = models
+                .Select(m => new XElement("Node", 
+                    new XAttribute("ConnectionId", m.ConnectionId),
+                    new XAttribute("Connected", m.Connected),
+                    new XAttribute("Expanded", m.Expanded)));
+
+            var root = new XElement("LocalConnections", localConnections);
+            var xdoc = new XDocument(new XDeclaration("1.0", "utf-8", null), root);
+            return WriteXmlToString(xdoc);
+        }
+
+        public IEnumerable<LocalConnectionPropertiesModel> Deserialize(string serializedData)
+        {
+            if (string.IsNullOrWhiteSpace(serializedData))
+                return Enumerable.Empty<LocalConnectionPropertiesModel>();
+
+            var xdoc = XDocument.Parse(serializedData);
+            return xdoc
+                .Descendants("Node")
+                .Where(e => e.Attribute("ConnectionId") != null)
+                .Select(e => new LocalConnectionPropertiesModel
+                {
+                    ConnectionId = e.Attribute("ConnectionId")?.Value,
+                    Connected = bool.Parse(e.Attribute("Connected")?.Value ?? "False"),
+                    Expanded = bool.Parse(e.Attribute("Expanded")?.Value ?? "False")
+                });
+        }
+
+        private static string WriteXmlToString(XNode xmlDocument)
+        {
+            string xmlString;
+            var xmlWriterSettings = new XmlWriterSettings { Indent = true, IndentChars = "    ", Encoding = Encoding.UTF8 };
+            var memoryStream = new MemoryStream();
+            using (var xmlTextWriter = XmlWriter.Create(memoryStream, xmlWriterSettings))
+            {
+                xmlDocument.WriteTo(xmlTextWriter);
+                xmlTextWriter.Flush();
+                var streamReader = new StreamReader(memoryStream, Encoding.UTF8, true);
+                memoryStream.Seek(0, SeekOrigin.Begin);
+                xmlString = streamReader.ReadToEnd();
+            }
+            return xmlString;
+        }
+    }
+}

mRemoteV1/Config/Serializers/ConnectionSerializers/MsSql/SqlConnectionListMetaData.cs

@@ -0,0 +1,13 @@
+using System;
+using System.Security;
+
+namespace mRemoteNG.Config.Serializers.MsSql
+{
+    public class SqlConnectionListMetaData
+    {
+        public string Name { get; set; }
+        public string Protected { get; set; }
+        public bool Export { get; set; }
+        public Version ConfVersion { get; set; }
+    }
+}

mRemoteV1/Config/Serializers/ConnectionSerializers/MsSql/SqlDatabaseMetaDataRetriever.cs

@@ -0,0 +1,93 @@
+using System;
+using System.Data.SqlClient;
+using System.Globalization;
+using mRemoteNG.App;
+using mRemoteNG.App.Info;
+using mRemoteNG.Config.DatabaseConnectors;
+using mRemoteNG.Messages;
+using mRemoteNG.Security;
+using mRemoteNG.Security.SymmetricEncryption;
+using mRemoteNG.Tools;
+using mRemoteNG.Tree.Root;
+
+namespace mRemoteNG.Config.Serializers.MsSql
+{
+	public class SqlDatabaseMetaDataRetriever
+    {
+        public SqlConnectionListMetaData GetDatabaseMetaData(SqlDatabaseConnector sqlDatabaseConnector)
+        {
+            SqlConnectionListMetaData metaData;
+            SqlDataReader sqlDataReader = null;
+            try
+            {
+                var sqlCommand = new SqlCommand("SELECT * FROM tblRoot", sqlDatabaseConnector.SqlConnection);
+                if (!sqlDatabaseConnector.IsConnected)
+                    sqlDatabaseConnector.Connect();
+                sqlDataReader = sqlCommand.ExecuteReader();
+                if (!sqlDataReader.HasRows)
+                    return null; // assume new empty database
+                else
+                    sqlDataReader.Read();
+
+                metaData = new SqlConnectionListMetaData
+                {
+                    Name = sqlDataReader["Name"] as string ?? "",
+                    Protected = sqlDataReader["Protected"] as string ?? "",
+                    Export = (bool)sqlDataReader["Export"],
+                    ConfVersion = new Version(Convert.ToString(sqlDataReader["confVersion"], CultureInfo.InvariantCulture))
+                };
+            }
+            catch (Exception ex)
+            {
+                Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg, $"Retrieving database version failed. {ex}");
+                throw;
+            }
+            finally
+            {
+                if (sqlDataReader != null && !sqlDataReader.IsClosed)
+                    sqlDataReader.Close();
+            }
+            return metaData;
+        }
+
+        public void WriteDatabaseMetaData(RootNodeInfo rootTreeNode, SqlDatabaseConnector sqlDatabaseConnector)
+        {
+	        var cryptographyProvider = new LegacyRijndaelCryptographyProvider();
+	        string strProtected;
+	        if (rootTreeNode != null)
+	        {
+		        if (rootTreeNode.Password)
+		        {
+			        var password = rootTreeNode.PasswordString.ConvertToSecureString();
+			        strProtected = cryptographyProvider.Encrypt("ThisIsProtected", password);
+		        }
+		        else
+		        {
+			        strProtected = cryptographyProvider.Encrypt("ThisIsNotProtected", Runtime.EncryptionKey);
+		        }
+	        }
+	        else
+	        {
+		        strProtected = cryptographyProvider.Encrypt("ThisIsNotProtected", Runtime.EncryptionKey);
+	        }
+
+	        var sqlQuery = new SqlCommand("DELETE FROM tblRoot", sqlDatabaseConnector.SqlConnection);
+	        sqlQuery.ExecuteNonQuery();
+
+	        if (rootTreeNode != null)
+	        {
+		        sqlQuery =
+			        new SqlCommand(
+				        "INSERT INTO tblRoot (Name, Export, Protected, ConfVersion) VALUES(\'" +
+				        MiscTools.PrepareValueForDB(rootTreeNode.Name) + "\', 0, \'" + strProtected + "\'," +
+				        ConnectionsFileInfo.ConnectionFileVersion.ToString(CultureInfo.InvariantCulture) + ")",
+				        sqlDatabaseConnector.SqlConnection);
+		        sqlQuery.ExecuteNonQuery();
+	        }
+	        else
+	        {
+		        Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg, $"UpdateRootNodeTable: rootTreeNode was null. Could not insert!");
+	        }
+		}
+    }
+}

mRemoteV1/Config/Serializers/ConnectionSerializers/Xml/XmlConnectionsDeserializer.cs

@@ -205,7 +205,9 @@ namespace mRemoteNG.Config.Serializers.Xml
         {
             if (xmlnode.Attributes == null) return null;
 
-			var connectionId = xmlnode.Attributes["Id"]?.Value ?? Guid.NewGuid().ToString();
+			var connectionId = xmlnode.Attributes["Id"]?.Value;
+            if (string.IsNullOrWhiteSpace(connectionId))
+                connectionId = Guid.NewGuid().ToString();
 			var connectionInfo = new ConnectionInfo(connectionId);
 
             try

mRemoteV1/Config/Serializers/MiscSerializers/RemoteDesktopConnectionManagerDeserializer.cs

@@ -13,7 +13,7 @@ using mRemoteNG.Tree.Root;
 
 namespace mRemoteNG.Config.Serializers
 {
-    public class RemoteDesktopConnectionManagerDeserializer : IDeserializer<string, ConnectionTreeModel>
+	public class RemoteDesktopConnectionManagerDeserializer : IDeserializer<string, ConnectionTreeModel>
     {
         private static int _schemaVersion; /* 1 = RDCMan v2.2
                                        3 = RDCMan v2.7  */
@@ -40,11 +40,15 @@ namespace mRemoteNG.Config.Serializers
 
         private static void VerifySchemaVersion(XmlNode rdcManNode)
         {
-            _schemaVersion = Convert.ToInt32(rdcManNode?.Attributes?["schemaVersion"].Value);
-            if (_schemaVersion != 1 && _schemaVersion != 3)
+	        if (!int.TryParse(rdcManNode?.Attributes?["schemaVersion"]?.Value, out var version))
+		        throw new FileFormatException("Could not find schema version attribute.");
+
+            if (version != 1 && version != 3)
             {
-                throw (new FileFormatException($"Unsupported schema version ({_schemaVersion})."));
+                throw new FileFormatException($"Unsupported schema version ({version}).");
             }
+
+            _schemaVersion = version;
         }
 
         private static void VerifyFileVersion(XmlNode rdcManNode)
@@ -114,7 +118,8 @@ namespace mRemoteNG.Config.Serializers
                 containerPropertiesNode = containerPropertiesNode.SelectSingleNode("./properties");
             }
             newContainer.Name = containerPropertiesNode?.SelectSingleNode("./name")?.InnerText ?? Language.strNewFolder;
-            newContainer.IsExpanded = bool.Parse(containerPropertiesNode?.SelectSingleNode("./expanded")?.InnerText ?? "false");
+            if (bool.TryParse(containerPropertiesNode?.SelectSingleNode("./expanded")?.InnerText, out var expanded))
+				newContainer.IsExpanded = expanded;
             parentContainer.AddChild(newContainer);
             return newContainer;
         }
@@ -129,17 +134,25 @@ namespace mRemoteNG.Config.Serializers
         {
             var connectionInfo = new ConnectionInfo {Protocol = ProtocolType.RDP};
 
-
             var propertiesNode = xmlNode.SelectSingleNode("./properties");
-            if (_schemaVersion == 1) propertiesNode = xmlNode;  // Version 2.2 defines the container name at the root instead
+            if (_schemaVersion == 1)
+	            propertiesNode = xmlNode;  // Version 2.2 defines the container name at the root instead
+
             connectionInfo.Hostname = propertiesNode?.SelectSingleNode("./name")?.InnerText ?? "";
-            connectionInfo.Name = propertiesNode?.SelectSingleNode("./displayName")?.InnerText ?? connectionInfo.Hostname;
+
+            var connectionDisplayName = propertiesNode?.SelectSingleNode("./displayName")?.InnerText;
+			connectionInfo.Name = !string.IsNullOrWhiteSpace(connectionDisplayName)
+                ? connectionDisplayName
+	            : string.IsNullOrWhiteSpace(connectionInfo.Hostname)
+	                ? connectionInfo.Name
+	                : connectionInfo.Hostname;
+
             connectionInfo.Description = propertiesNode?.SelectSingleNode("./comment")?.InnerText ?? string.Empty;
 
             var logonCredentialsNode = xmlNode.SelectSingleNode("./logonCredentials");
             if (logonCredentialsNode?.Attributes?["inherit"]?.Value == "None")
             {
-                connectionInfo.Username = logonCredentialsNode.SelectSingleNode("userName")?.InnerText;
+                connectionInfo.Username = logonCredentialsNode.SelectSingleNode("userName")?.InnerText ?? string.Empty;
 
                 var passwordNode = logonCredentialsNode.SelectSingleNode("./password");
                 if (_schemaVersion == 1) // Version 2.2 allows clear text passwords
@@ -153,7 +166,7 @@ namespace mRemoteNG.Config.Serializers
                     connectionInfo.Password = DecryptRdcManPassword(passwordNode?.InnerText);
                 }
 
-                connectionInfo.Domain = logonCredentialsNode.SelectSingleNode("./domain")?.InnerText;
+                connectionInfo.Domain = logonCredentialsNode.SelectSingleNode("./domain")?.InnerText ?? string.Empty;
             }
             else
             {
@@ -165,10 +178,12 @@ namespace mRemoteNG.Config.Serializers
             var connectionSettingsNode = xmlNode.SelectSingleNode("./connectionSettings");
             if (connectionSettingsNode?.Attributes?["inherit"]?.Value == "None")
             {
-                connectionInfo.UseConsoleSession = bool.Parse(connectionSettingsNode.SelectSingleNode("./connectToConsole")?.InnerText ?? "false");
+				if (bool.TryParse(connectionSettingsNode.SelectSingleNode("./connectToConsole")?.InnerText, out var useConsole))
+					connectionInfo.UseConsoleSession = useConsole;
                 // ./startProgram
                 // ./workingDir
-                connectionInfo.Port = Convert.ToInt32(connectionSettingsNode.SelectSingleNode("./port")?.InnerText);
+                if (int.TryParse(connectionSettingsNode.SelectSingleNode("./port")?.InnerText, out var port))
+					connectionInfo.Port = port;
             }
             else
             {
@@ -179,14 +194,18 @@ namespace mRemoteNG.Config.Serializers
             var gatewaySettingsNode = xmlNode.SelectSingleNode("./gatewaySettings");
             if (gatewaySettingsNode?.Attributes?["inherit"]?.Value == "None")
             {
-                connectionInfo.RDGatewayUsageMethod = gatewaySettingsNode.SelectSingleNode("./enabled")?.InnerText == "True" ? RdpProtocol.RDGatewayUsageMethod.Always : RdpProtocol.RDGatewayUsageMethod.Never;
-                connectionInfo.RDGatewayHostname = gatewaySettingsNode.SelectSingleNode("./hostName")?.InnerText;
-                connectionInfo.RDGatewayUsername = gatewaySettingsNode.SelectSingleNode("./userName")?.InnerText;
+                connectionInfo.RDGatewayUsageMethod = gatewaySettingsNode.SelectSingleNode("./enabled")?.InnerText == "True" 
+	                ? RdpProtocol.RDGatewayUsageMethod.Always 
+	                : RdpProtocol.RDGatewayUsageMethod.Never;
+                connectionInfo.RDGatewayHostname = gatewaySettingsNode.SelectSingleNode("./hostName")?.InnerText ?? string.Empty;
+                connectionInfo.RDGatewayUsername = gatewaySettingsNode.SelectSingleNode("./userName")?.InnerText ?? string.Empty;
 
                 var passwordNode = gatewaySettingsNode.SelectSingleNode("./password");
-                connectionInfo.RDGatewayPassword = passwordNode?.Attributes?["storeAsClearText"]?.Value == "True" ? passwordNode.InnerText : DecryptRdcManPassword(passwordNode?.InnerText);
+                connectionInfo.RDGatewayPassword = passwordNode?.Attributes?["storeAsClearText"]?.Value == "True" 
+	                ? passwordNode.InnerText 
+	                : DecryptRdcManPassword(passwordNode?.InnerText);
 
-                connectionInfo.RDGatewayDomain = gatewaySettingsNode.SelectSingleNode("./domain")?.InnerText;
+                connectionInfo.RDGatewayDomain = gatewaySettingsNode.SelectSingleNode("./domain")?.InnerText ?? string.Empty;
                 // ./logonMethod
                 // ./localBypass
                 // ./credSharing
@@ -203,15 +222,10 @@ namespace mRemoteNG.Config.Serializers
             var remoteDesktopNode = xmlNode.SelectSingleNode("./remoteDesktop");
             if (remoteDesktopNode?.Attributes?["inherit"]?.Value == "None")
             {
-                var resolutionString = remoteDesktopNode.SelectSingleNode("./size")?.InnerText.Replace(" ", "");
-                try
-                {
-                    connectionInfo.Resolution = (RdpProtocol.RDPResolutions)Enum.Parse(typeof(RdpProtocol.RDPResolutions), "Res" + resolutionString);
-                }
-                catch (ArgumentException)
-                {
-                    connectionInfo.Resolution = RdpProtocol.RDPResolutions.FitToWindow;
-                }
+                connectionInfo.Resolution = 
+	                Enum.TryParse<RdpProtocol.RDPResolutions>(remoteDesktopNode.SelectSingleNode("./size")?.InnerText.Replace(" ", ""), true, out var rdpResolution)
+	                ? rdpResolution
+                    : RdpProtocol.RDPResolutions.FitToWindow;
 
                 if (remoteDesktopNode.SelectSingleNode("./sameSizeAsClientArea")?.InnerText == "True")
                 {
@@ -223,9 +237,8 @@ namespace mRemoteNG.Config.Serializers
                     connectionInfo.Resolution = RdpProtocol.RDPResolutions.Fullscreen;
                 }
 
-                var colorDepth = remoteDesktopNode.SelectSingleNode("./colorDepth")?.InnerText;
-                if (colorDepth != null)
-                    connectionInfo.Colors = (RdpProtocol.RDPColors)Enum.Parse(typeof(RdpProtocol.RDPColors), colorDepth);
+                if (Enum.TryParse<RdpProtocol.RDPColors>(remoteDesktopNode.SelectSingleNode("./colorDepth")?.InnerText, true, out var rdpColors))
+	                connectionInfo.Colors = rdpColors;
             }
             else
             {
@@ -274,10 +287,17 @@ namespace mRemoteNG.Config.Serializers
                 }
 
                 // ./redirectClipboard
-                connectionInfo.RedirectDiskDrives = bool.Parse(localResourcesNode?.SelectSingleNode("./redirectDrives")?.InnerText ?? "false");
-                connectionInfo.RedirectPorts = bool.Parse(localResourcesNode?.SelectSingleNode("./redirectPorts")?.InnerText ?? "false");
-                connectionInfo.RedirectPrinters = bool.Parse(localResourcesNode?.SelectSingleNode("./redirectPrinters")?.InnerText ?? "false");
-                connectionInfo.RedirectSmartCards = bool.Parse(localResourcesNode?.SelectSingleNode("./redirectSmartCards")?.InnerText ?? "false");
+                if (bool.TryParse(localResourcesNode?.SelectSingleNode("./redirectDrives")?.InnerText, out var redirectDisks))
+	                connectionInfo.RedirectDiskDrives = redirectDisks;
+
+                if (bool.TryParse(localResourcesNode?.SelectSingleNode("./redirectPorts")?.InnerText, out var redirectPorts))
+	                connectionInfo.RedirectPorts = redirectPorts;
+
+                if (bool.TryParse(localResourcesNode?.SelectSingleNode("./redirectPrinters")?.InnerText, out var redirectPrinters))
+	                connectionInfo.RedirectPrinters = redirectPrinters;
+
+                if (bool.TryParse(localResourcesNode?.SelectSingleNode("./redirectSmartCards")?.InnerText, out var redirectSmartCards))
+	                connectionInfo.RedirectSmartCards = redirectSmartCards;
             }
             else
             {

mRemoteV1/Config/Serializers/Versioning/SqlDatabaseVersionRetriever.cs

@@ -1,41 +0,0 @@
-using System;
-using System.Data.SqlClient;
-using System.Globalization;
-using mRemoteNG.App;
-using mRemoteNG.Config.DatabaseConnectors;
-using mRemoteNG.Messages;
-
-namespace mRemoteNG.Config.Serializers.Versioning
-{
-    public class SqlDatabaseVersionRetriever
-    {
-        public Version GetDatabaseVersion(SqlDatabaseConnector sqlDatabaseConnector)
-        {
-            Version databaseVersion;
-            SqlDataReader sqlDataReader = null;
-            try
-            {
-                var sqlCommand = new SqlCommand("SELECT * FROM tblRoot", sqlDatabaseConnector.SqlConnection);
-                if (!sqlDatabaseConnector.IsConnected)
-                    sqlDatabaseConnector.Connect();
-                sqlDataReader = sqlCommand.ExecuteReader();
-                if (!sqlDataReader.HasRows)
-                    return new Version(); // assume new empty database
-                else
-                    sqlDataReader.Read();
-                databaseVersion = new Version(Convert.ToString(sqlDataReader["confVersion"], CultureInfo.InvariantCulture));
-            }
-            catch (Exception ex)
-            {
-                Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg, $"Retrieving database version failed. {ex}");
-                throw;
-            }
-            finally
-            {
-                if (sqlDataReader != null && !sqlDataReader.IsClosed)
-                    sqlDataReader.Close();
-            }
-            return databaseVersion;
-        }
-    }
-}

mRemoteV1/Config/Serializers/Versioning/SqlDatabaseVersionVerifier.cs

@@ -9,7 +9,6 @@ namespace mRemoteNG.Config.Serializers.Versioning
     public class SqlDatabaseVersionVerifier
     {
         private readonly SqlDatabaseConnector _sqlDatabaseConnector;
-        private readonly SqlDatabaseVersionRetriever _versionRetriever;
 
         public SqlDatabaseVersionVerifier(SqlDatabaseConnector sqlDatabaseConnector)
         {
@@ -17,15 +16,14 @@ namespace mRemoteNG.Config.Serializers.Versioning
                 throw new ArgumentNullException(nameof(sqlDatabaseConnector));
 
             _sqlDatabaseConnector = sqlDatabaseConnector;
-            _versionRetriever = new SqlDatabaseVersionRetriever();
         }
 
-        public bool VerifyDatabaseVersion()
+        public bool VerifyDatabaseVersion(Version dbVersion)
         {
             var isVerified = false;
             try
             {
-                var databaseVersion = _versionRetriever.GetDatabaseVersion(_sqlDatabaseConnector);
+                var databaseVersion = dbVersion;
 
                 if (databaseVersion.Equals(new Version()))
                 {

mRemoteV1/Config/Settings/SettingsLoader.cs

@@ -19,6 +19,7 @@ namespace mRemoteNG.Config.Settings
 	{
         private readonly ExternalAppsLoader _externalAppsLoader;
         private readonly MessageCollector _messageCollector;
+	    private readonly MenuStrip _mainMenu;
         private readonly QuickConnectToolStrip _quickConnectToolStrip;
         private readonly ExternalToolsToolStrip _externalToolsToolStrip;
 	    private readonly MultiSshToolStrip _multiSshToolStrip;
@@ -31,7 +32,8 @@ namespace mRemoteNG.Config.Settings
             MessageCollector messageCollector, 
             QuickConnectToolStrip quickConnectToolStrip, 
             ExternalToolsToolStrip externalToolsToolStrip,
-            MultiSshToolStrip multiSshToolStrip)
+            MultiSshToolStrip multiSshToolStrip,
+            MenuStrip mainMenu)
 		{
             if (mainForm == null)
                 throw new ArgumentNullException(nameof(mainForm));
@@ -43,13 +45,16 @@ namespace mRemoteNG.Config.Settings
                 throw new ArgumentNullException(nameof(externalToolsToolStrip));
             if (multiSshToolStrip == null)
                 throw new ArgumentNullException(nameof(multiSshToolStrip));
+		    if (mainMenu == null)
+		        throw new ArgumentNullException(nameof(mainMenu));
 
             MainForm = mainForm;
 	        _messageCollector = messageCollector;
 	        _quickConnectToolStrip = quickConnectToolStrip;
 	        _externalToolsToolStrip = externalToolsToolStrip;
 		    _multiSshToolStrip = multiSshToolStrip;
-            _externalAppsLoader = new ExternalAppsLoader(MainForm, messageCollector, _externalToolsToolStrip);
+		    _mainMenu = mainMenu;
+		    _externalAppsLoader = new ExternalAppsLoader(MainForm, messageCollector, _externalToolsToolStrip);
         }
         
         #region Public Methods
@@ -197,6 +202,7 @@ namespace mRemoteNG.Config.Settings
 	    private void LoadToolbarsFromSettings()
 		{
             ResetAllToolbarLocations();
+		    AddMainMenuPanel();
             AddExternalAppsPanel();
 		    AddQuickConnectPanel();
 		    AddMultiSshPanel();
@@ -210,31 +216,49 @@ namespace mRemoteNG.Config.Settings
 	    private void ResetAllToolbarLocations()
 	    {
 	        var tempToolStrip = new ToolStripPanel();
+            tempToolStrip.Join(_mainMenu);
 	        tempToolStrip.Join(_quickConnectToolStrip);
 	        tempToolStrip.Join(_externalToolsToolStrip);
 	        tempToolStrip.Join(_multiSshToolStrip);
         }
 
+	    private void AddMainMenuPanel()
+	    {
+	        SetToolstripGripStyle(_mainMenu);
+            var toolStripPanel = ToolStripPanelFromString("top");
+	        toolStripPanel.Join(_mainMenu, new Point(3, 0));
+        }
+
 		private void AddQuickConnectPanel()
 		{
+		    SetToolstripGripStyle(_quickConnectToolStrip);
+            _quickConnectToolStrip.Visible = mRemoteNG.Settings.Default.QuickyTBVisible;
             var toolStripPanel = ToolStripPanelFromString(mRemoteNG.Settings.Default.QuickyTBParentDock);
             toolStripPanel.Join(_quickConnectToolStrip, mRemoteNG.Settings.Default.QuickyTBLocation);
-            _quickConnectToolStrip.Visible = mRemoteNG.Settings.Default.QuickyTBVisible;
 		}
 		
 		private void AddExternalAppsPanel()
 		{
-		    var toolStripPanel = ToolStripPanelFromString(mRemoteNG.Settings.Default.ExtAppsTBParentDock);
-            toolStripPanel.Join(_externalToolsToolStrip, mRemoteNG.Settings.Default.ExtAppsTBLocation);
+		    SetToolstripGripStyle(_externalToolsToolStrip);
             _externalToolsToolStrip.Visible = mRemoteNG.Settings.Default.ExtAppsTBVisible;
+            var toolStripPanel = ToolStripPanelFromString(mRemoteNG.Settings.Default.ExtAppsTBParentDock);
+            toolStripPanel.Join(_externalToolsToolStrip, mRemoteNG.Settings.Default.ExtAppsTBLocation);
 		}
 
 	    private void AddMultiSshPanel()
 	    {
-	        var toolStripPanel = ToolStripPanelFromString(mRemoteNG.Settings.Default.ExtAppsTBParentDock);
-            toolStripPanel.Join(_multiSshToolStrip, mRemoteNG.Settings.Default.MultiSshToolbarLocation);
+	        SetToolstripGripStyle(_multiSshToolStrip);
 	        _multiSshToolStrip.Visible = mRemoteNG.Settings.Default.MultiSshToolbarVisible;
+            var toolStripPanel = ToolStripPanelFromString(mRemoteNG.Settings.Default.MultiSshToolbarParentDock);
+            toolStripPanel.Join(_multiSshToolStrip, mRemoteNG.Settings.Default.MultiSshToolbarLocation);
 	    }
+
+	    private void SetToolstripGripStyle(ToolStrip toolbar)
+	    {
+	        toolbar.GripStyle = mRemoteNG.Settings.Default.LockToolbars
+	            ? ToolStripGripStyle.Hidden
+	            : ToolStripGripStyle.Visible;
+        }
 		
 		private ToolStripPanel ToolStripPanelFromString(string panel)
 		{

mRemoteV1/Connection/AbstractConnectionRecord.cs

@@ -674,7 +674,7 @@ namespace mRemoteNG.Connection
             PropertyChanged?.Invoke(sender, new PropertyChangedEventArgs(args.PropertyName));
         }
 
-        private void SetField<T>(ref T field, T value, string propertyName = null)
+        protected void SetField<T>(ref T field, T value, string propertyName = null)
         {
             if (EqualityComparer<T>.Default.Equals(field, value)) return;
             field = value;

mRemoteV1/Connection/ConnectionInfo.cs

@@ -1,8 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Reflection;
 using mRemoteNG.App;
 using mRemoteNG.Connection.Protocol;
 using mRemoteNG.Connection.Protocol.Http;
@@ -15,11 +10,16 @@ using mRemoteNG.Connection.Protocol.Telnet;
 using mRemoteNG.Connection.Protocol.VNC;
 using mRemoteNG.Container;
 using mRemoteNG.Tree;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Reflection;
 
 
 namespace mRemoteNG.Connection
 {
-	[DefaultProperty("Name")]
+    [DefaultProperty("Name")]
     public class ConnectionInfo : AbstractConnectionRecord, IHasParent, IInheritable
     {        
         #region Public Properties
@@ -78,7 +78,8 @@ namespace mRemoteNG.Connection
 		    var newConnectionInfo = new ConnectionInfo();
             newConnectionInfo.CopyFrom(this);
 		    newConnectionInfo.Inheritance = Inheritance.Clone();
-			return newConnectionInfo;
+            newConnectionInfo.Inheritance.Parent = newConnectionInfo;
+            return newConnectionInfo;
 		}
 
 	    public void CopyFrom(ConnectionInfo sourceConnectionInfo)
@@ -172,8 +173,11 @@ namespace mRemoteNG.Connection
             if (!ShouldThisPropertyBeInherited(propertyName))
                 return value;
 
-            var inheritedValue = GetInheritedPropertyValue<TPropertyType>(propertyName);
-            return inheritedValue.Equals(default(TPropertyType)) ? value : inheritedValue;
+            var couldGetInheritedValue = TryGetInheritedPropertyValue<TPropertyType>(propertyName, out var inheritedValue);
+
+            return couldGetInheritedValue
+                ? inheritedValue
+                : value;
         }
 
 	    private bool ShouldThisPropertyBeInherited(string propertyName)
@@ -194,22 +198,23 @@ namespace mRemoteNG.Connection
             return inheritPropertyValue;
         }
 
-        private TPropertyType GetInheritedPropertyValue<TPropertyType>(string propertyName)
+        private bool TryGetInheritedPropertyValue<TPropertyType>(string propertyName, out TPropertyType inheritedValue)
         {
             try
             {
                 var connectionInfoType = Parent.GetType();
                 var parentPropertyInfo = connectionInfoType.GetProperty(propertyName);
                 if (parentPropertyInfo == null)
-                    return default(TPropertyType); // shouldn't get here...
-                var parentPropertyValue = (TPropertyType)parentPropertyInfo.GetValue(Parent, null);
+                    throw new NullReferenceException($"Could not retrieve property data for property '{propertyName}' on parent node '{Parent?.Name}'");
 
-                return parentPropertyValue;
+                inheritedValue = (TPropertyType)parentPropertyInfo.GetValue(Parent, null);
+                return true;
             }
             catch (Exception e)
             {
                 Runtime.MessageCollector.AddExceptionStackTrace($"Error retrieving inherited property '{propertyName}'", e);
-                return default(TPropertyType);
+                inheritedValue = default(TPropertyType);
+                return false;
             }
         }
 

mRemoteV1/Connection/ConnectionInitiator.cs

@@ -1,6 +1,4 @@
-using System;
-using System.Windows.Forms;
-using mRemoteNG.App;
+using mRemoteNG.App;
 using mRemoteNG.Connection.Protocol;
 using mRemoteNG.Connection.Protocol.RDP;
 using mRemoteNG.Container;
@@ -8,14 +6,23 @@ using mRemoteNG.Messages;
 using mRemoteNG.UI.Forms;
 using mRemoteNG.UI.Panels;
 using mRemoteNG.UI.Window;
+using System;
+using System.Collections.Generic;
+using System.Windows.Forms;
 using TabPage = Crownwood.Magic.Controls.TabPage;
 
 
 namespace mRemoteNG.Connection
 {
-	public class ConnectionInitiator : IConnectionInitiator
+    public class ConnectionInitiator : IConnectionInitiator
     {
         private readonly PanelAdder _panelAdder = new PanelAdder();
+        private readonly List<string> _activeConnections = new List<string>();
+
+        /// <summary>
+        /// List of unique IDs of the currently active connections
+        /// </summary>
+        public IEnumerable<string> ActiveConnections => _activeConnections;
 
         public void OpenConnection(ContainerInfo containerInfo, ConnectionInfo.Force force = ConnectionInfo.Force.None)
         {
@@ -118,6 +125,7 @@ namespace mRemoteNG.Connection
                 }
 
                 connectionInfo.OpenConnections.Add(newProtocol);
+                _activeConnections.Add(connectionInfo.ConstantID);
                 FrmMain.Default.SelectedConnection = connectionInfo;
             }
             catch (Exception ex)
@@ -210,7 +218,7 @@ namespace mRemoteNG.Connection
             newProtocol.Closed += ((ConnectionWindow)connectionForm).Prot_Event_Closed;
         }
 
-        private static void SetConnectionEventHandlers(ProtocolBase newProtocol)
+        private void SetConnectionEventHandlers(ProtocolBase newProtocol)
         {
             newProtocol.Disconnected += Prot_Event_Disconnected;
             newProtocol.Connected += Prot_Event_Connected;
@@ -251,7 +259,7 @@ namespace mRemoteNG.Connection
             }
         }
 
-        private static void Prot_Event_Closed(object sender)
+        private void Prot_Event_Closed(object sender)
         {
             try
             {
@@ -267,6 +275,8 @@ namespace mRemoteNG.Connection
 
                 Runtime.MessageCollector.AddMessage(MessageClass.InformationMsg, string.Format(Language.strConnenctionClosedByUser, connDetail, prot.InterfaceControl.Info.Protocol, Environment.UserName));
                 prot.InterfaceControl.Info.OpenConnections.Remove(prot);
+                if (_activeConnections.Contains(prot.InterfaceControl.Info.ConstantID))
+                    _activeConnections.Remove(prot.InterfaceControl.Info.ConstantID);
 
                 if (prot.InterfaceControl.Info.PostExtApp == "") return;
                 var extA = Runtime.ExternalToolsService.GetExtAppByName(prot.InterfaceControl.Info.PostExtApp);

mRemoteV1/Connection/ConnectionsService.cs

@@ -4,9 +4,12 @@ using System.Threading;
 using System.Windows.Forms;
 using mRemoteNG.App;
 using mRemoteNG.App.Info;
+using mRemoteNG.Config;
 using mRemoteNG.Config.Connections;
 using mRemoteNG.Config.Connections.Multiuser;
+using mRemoteNG.Config.DataProviders;
 using mRemoteNG.Config.Putty;
+using mRemoteNG.Config.Serializers.MsSql;
 using mRemoteNG.Connection.Protocol;
 using mRemoteNG.Messages;
 using mRemoteNG.Security;
@@ -17,10 +20,12 @@ using mRemoteNG.UI;
 
 namespace mRemoteNG.Connection
 {
-    public class ConnectionsService
+	public class ConnectionsService
     {
         private static readonly object SaveLock = new object();
         private readonly PuttySessionsManager _puttySessionsManager;
+        private readonly IDataProvider<string> _localConnectionPropertiesDataProvider;
+        private readonly LocalConnectionPropertiesXmlSerializer _localConnectionPropertiesSerializer;
         private bool _batchingSaves = false;
         private bool _saveRequested = false;
         private bool _saveAsyncRequested = false;
@@ -39,12 +44,16 @@ namespace mRemoteNG.Connection
                 throw new ArgumentNullException(nameof(puttySessionsManager));
 
             _puttySessionsManager = puttySessionsManager;
+            var path = SettingsFileInfo.SettingsPath;
+            _localConnectionPropertiesDataProvider = new FileDataProvider(Path.Combine(path, "LocalConnectionProperties.xml"));
+            _localConnectionPropertiesSerializer = new LocalConnectionPropertiesXmlSerializer();
         }
 
         public void NewConnectionsFile(string filename)
         {
             try
             {
+                filename.ThrowIfNullOrEmpty(nameof(filename));
                 var newConnectionsModel = new ConnectionTreeModel();
                 newConnectionsModel.AddRootNode(new RootNodeInfo(RootNodeType.Connection));
                 SaveConnections(newConnectionsModel, false, new SaveFilter(), filename, true);
@@ -105,9 +114,14 @@ namespace mRemoteNG.Connection
             var oldConnectionTreeModel = ConnectionTreeModel;
             var oldIsUsingDatabaseValue = UsingDatabase;
 
-            var newConnectionTreeModel = useDatabase
-                ? new SqlConnectionsLoader().Load()
-                : new XmlConnectionsLoader(connectionFileName).Load();
+            var connectionLoader = useDatabase
+                ? (IConnectionsLoader)new SqlConnectionsLoader(_localConnectionPropertiesSerializer, _localConnectionPropertiesDataProvider)
+                : new XmlConnectionsLoader(connectionFileName);
+
+            var newConnectionTreeModel = connectionLoader.Load();
+
+            if (useDatabase)
+                LastSqlUpdate = DateTime.Now;
 
             if (newConnectionTreeModel == null)
             {
@@ -128,13 +142,25 @@ namespace mRemoteNG.Connection
             ConnectionTreeModel = newConnectionTreeModel;
             UpdateCustomConsPathSetting(connectionFileName);
             RaiseConnectionsLoadedEvent(oldConnectionTreeModel, newConnectionTreeModel, oldIsUsingDatabaseValue, useDatabase, connectionFileName);
+            Runtime.MessageCollector.AddMessage(MessageClass.DebugMsg, $"Connections loaded using {connectionLoader.GetType().Name}");
         }
 
+        /// <summary>
+        /// When turned on, calls to <see cref="SaveConnections()"/> or
+        /// <see cref="SaveConnectionsAsync"/> will not immediately execute.
+        /// Instead, they will be deferred until <see cref="EndBatchingSaves"/>
+        /// is called.
+        /// </summary>
         public void BeginBatchingSaves()
         {
             _batchingSaves = true;
         }
 
+        /// <summary>
+        /// Immediately executes a single <see cref="SaveConnections()"/> or
+        /// <see cref="SaveConnectionsAsync"/> if one has been requested
+        /// since calling <see cref="BeginBatchingSaves"/>.
+        /// </summary>
         public void EndBatchingSaves()
         {
             _batchingSaves = false;
@@ -145,6 +171,19 @@ namespace mRemoteNG.Connection
                 SaveConnections();
         }
 
+		/// <summary>
+		/// All calls to <see cref="SaveConnections()"/> or <see cref="SaveConnectionsAsync"/>
+		/// will be deferred until the returned <see cref="DisposableAction"/> is disposed.
+		/// Once disposed, this will immediately executes a single <see cref="SaveConnections()"/>
+		/// or <see cref="SaveConnectionsAsync"/> if one has been requested.
+		/// Place this call in a 'using' block to represent a batched saving context.
+		/// </summary>
+		/// <returns></returns>
+		public DisposableAction BatchedSavingContext()
+        {
+			return new DisposableAction(BeginBatchingSaves, EndBatchingSaves);
+        }
+
         /// <summary>
         /// Saves the currently loaded <see cref="ConnectionTreeModel"/> with
         /// no <see cref="SaveFilter"/>.
@@ -163,7 +202,17 @@ namespace mRemoteNG.Connection
         /// <param name="saveFilter"></param>
         /// <param name="connectionFileName"></param>
         /// <param name="forceSave">Bypasses safety checks that prevent saving if a connection file isn't loaded.</param>
-        public void SaveConnections(ConnectionTreeModel connectionTreeModel, bool useDatabase, SaveFilter saveFilter, string connectionFileName, bool forceSave = false)
+        /// <param name="propertyNameTrigger">
+        /// Optional. The name of the property that triggered
+        /// this save.
+        /// </param>
+        public void SaveConnections(
+            ConnectionTreeModel connectionTreeModel, 
+            bool useDatabase, 
+            SaveFilter saveFilter, 
+            string connectionFileName, 
+            bool forceSave = false,
+            string propertyNameTrigger = "")
         {
             if (connectionTreeModel == null)
                 return;
@@ -183,10 +232,13 @@ namespace mRemoteNG.Connection
                 RemoteConnectionsSyncronizer?.Disable();
 
                 var previouslyUsingDatabase = UsingDatabase;
-                if (useDatabase)
-                    new SqlConnectionsSaver(saveFilter).Save(connectionTreeModel);
-                else
-                    new XmlConnectionsSaver(connectionFileName, saveFilter).Save(connectionTreeModel);
+
+                var saver = useDatabase
+                    ? (ISaver<ConnectionTreeModel>)new SqlConnectionsSaver(saveFilter, _localConnectionPropertiesSerializer,
+                        _localConnectionPropertiesDataProvider)
+                    : new XmlConnectionsSaver(connectionFileName, saveFilter);
+
+                saver.Save(connectionTreeModel, propertyNameTrigger);
 
                 if (UsingDatabase)
                     LastSqlUpdate = DateTime.Now;
@@ -206,7 +258,14 @@ namespace mRemoteNG.Connection
             }
         }
 
-        public void SaveConnectionsAsync()
+        /// <summary>
+        /// Save the currently loaded connections asynchronously
+        /// </summary>
+        /// <param name="propertyNameTrigger">
+        /// Optional. The name of the property that triggered
+        /// this save.
+        /// </param>
+        public void SaveConnectionsAsync(string propertyNameTrigger = "")
         {
             if (_batchingSaves)
             {
@@ -214,18 +273,22 @@ namespace mRemoteNG.Connection
                 return;
             }
 
-            var t = new Thread(SaveConnectionsBGd);
+            var t = new Thread(() =>
+            {
+                lock (SaveLock)
+                {
+                    SaveConnections(
+                        ConnectionTreeModel, 
+                        UsingDatabase, 
+                        new SaveFilter(), 
+                        ConnectionFileName, 
+                        propertyNameTrigger: propertyNameTrigger);
+                }
+            });
             t.SetApartmentState(ApartmentState.STA);
             t.Start();
         }
 
-        private void SaveConnectionsBGd()
-        {
-            Monitor.Enter(SaveLock);
-            SaveConnections();
-            Monitor.Exit(SaveLock);
-        }
-
         public string GetStartupConnectionFileName()
         {
             return Settings.Default.LoadConsFromCustomLocation == false 

mRemoteV1/Connection/DefaultConnectionInfo.cs

@@ -31,9 +31,14 @@ namespace mRemoteNG.Connection
 						throw new SettingsPropertyNotFoundException($"No property with name '{expectedPropertyName}' found.");
 
 					var valueFromSource = propertyFromSource.GetValue(sourceInstance, null);
-	                var value = Convert.ChangeType(valueFromSource, property.PropertyType);
+                    
+                    if (property.PropertyType.IsEnum)
+                    {
+                        property.SetValue(Instance, Enum.Parse(property.PropertyType, valueFromSource.ToString()), null);
+                        continue;
+                    }
 
-                    property.SetValue(Instance, value, null);
+                    property.SetValue(Instance, Convert.ChangeType(valueFromSource, property.PropertyType), null);
                 }
                 catch (Exception ex)
                 {

mRemoteV1/Connection/IConnectionInitiator.cs

@@ -1,9 +1,12 @@
 using mRemoteNG.Container;
+using System.Collections.Generic;
 
 namespace mRemoteNG.Connection
 {
     public interface IConnectionInitiator
     {
+        IEnumerable<string> ActiveConnections { get; }
+
         void OpenConnection(ConnectionInfo connectionInfo);
 
         void OpenConnection(ContainerInfo containerInfo, ConnectionInfo.Force force = ConnectionInfo.Force.None);

mRemoteV1/Connection/Protocol/ICA/IcaProtocol.cs

@@ -117,57 +117,55 @@ namespace mRemoteNG.Connection.Protocol.ICA
 					return;
 				}
 
-			    var user = _info?.Username ?? "";
-			    var pass = _info?.Password ?? "";
-			    var dom = _info?.Domain ?? "";
+				var user = _info?.Username ?? "";
+				var pass = _info?.Password ?? "";
+				var dom = _info?.Domain ?? "";
 
 				if (string.IsNullOrEmpty(user))
 				{
 					if (Settings.Default.EmptyCredentials == "windows")
 					{
-						_icaClient.Username = Environment.UserName;
+						user = Environment.UserName;
 					}
-					else if (Settings.Default.EmptyCredentials == "custom")
+					else if (Settings.Default.EmptyCredentials == "custom" || Settings.Default.EmptyCredentials == "admpwd")
 					{
-						_icaClient.Username = Settings.Default.DefaultUsername;
+						user = Settings.Default.DefaultUsername;
 					}
 				}
-				else
+				if (string.IsNullOrEmpty(dom))
 				{
-					_icaClient.Username = user;
+					if (Settings.Default.EmptyCredentials == "windows")
+					{
+						dom = Environment.UserDomainName;
+					}
+					else if (Settings.Default.EmptyCredentials == "custom" || Settings.Default.EmptyCredentials == "admpwd")
+					{
+						dom = Settings.Default.DefaultDomain;
+					}
 				}
-						
+				_icaClient.Username = user;
+				_icaClient.Domain = dom;
+
 				if (string.IsNullOrEmpty(pass))
 				{
 					if (Settings.Default.EmptyCredentials == "custom")
 					{
 						if (Settings.Default.DefaultPassword != "")
 						{
-                            var cryptographyProvider = new LegacyRijndaelCryptographyProvider();
-                            _icaClient.SetProp("ClearPassword", cryptographyProvider.Decrypt(Settings.Default.DefaultPassword, Runtime.EncryptionKey));
+							var cryptographyProvider = new LegacyRijndaelCryptographyProvider();
+							pass = cryptographyProvider.Decrypt(Settings.Default.DefaultPassword, Runtime.EncryptionKey);
 						}
 					}
-				}
-				else
-				{
-					_icaClient.SetProp("ClearPassword", pass);
-				}
-						
-				if (string.IsNullOrEmpty(dom))
-				{
-					if (Settings.Default.EmptyCredentials == "windows")
+					if (Settings.Default.EmptyCredentials == "admpwd")
 					{
-						_icaClient.Domain = Environment.UserDomainName;
-					}
-					else if (Settings.Default.EmptyCredentials == "custom")
-					{
-						_icaClient.Domain = Settings.Default.DefaultDomain;
+						if (dom == ".")
+							pass = AdmPwd.PDSUtils.PdsWrapper.GetPassword(null, _info.Hostname, AdmPwd.Types.IdentityType.LocalComputerAdmin, false, false).Password;
+						else
+							pass = AdmPwd.PDSUtils.PdsWrapper.GetPassword(dom, user, AdmPwd.Types.IdentityType.ManagedDomainAccount, false, false).Password;
 					}
 				}
-				else
-				{
-					_icaClient.Domain = dom;
-				}
+
+				_icaClient.SetProp("ClearPassword", pass);
 			}
 			catch (Exception ex)
 			{

mRemoteV1/Connection/Protocol/PuttyBase.cs

@@ -13,7 +13,7 @@ using mRemoteNG.Tools.Cmdline;
 namespace mRemoteNG.Connection.Protocol
 {
 	public class PuttyBase : ProtocolBase
-	{	
+	{
 		private const int IDM_RECONF = 0x50; // PuTTY Settings Menu ID
 	    private bool _isPuttyNg;
 
@@ -42,7 +42,7 @@ namespace mRemoteNG.Connection.Protocol
             Event_Closed(this);
 		}
         #endregion
-				
+
         #region Public Methods
 		public override bool Connect()
 		{
@@ -62,11 +62,11 @@ namespace mRemoteNG.Connection.Protocol
 			    var arguments = new CommandLineArguments {EscapeForShell = false};
 
 			    arguments.Add("-load", InterfaceControl.Info.PuttySession);
-						
+
 				if (!(InterfaceControl.Info is PuttySessionInfo))
 				{
 					arguments.Add("-" + PuttyProtocol);
-							
+
 					if (PuttyProtocol == Putty_Protocol.ssh)
 					{
 						var username = "";
@@ -89,7 +89,7 @@ namespace mRemoteNG.Connection.Protocol
 						            break;
 						    }
 						}
-						
+
 						if (!string.IsNullOrEmpty(InterfaceControl.Info?.Password))
 						{
 							password = InterfaceControl.Info.Password;
@@ -102,9 +102,9 @@ namespace mRemoteNG.Connection.Protocol
                                 password = cryptographyProvider.Decrypt(Settings.Default.DefaultPassword, Runtime.EncryptionKey);
 							}
 						}
-						
+
 						arguments.Add("-" + (int)PuttySSHVersion);
-								
+
 						if (((int)Force & (int)ConnectionInfo.Force.NoCredentials) != (int)ConnectionInfo.Force.NoCredentials)
 						{
 							if (!string.IsNullOrEmpty(username))
@@ -117,24 +117,24 @@ namespace mRemoteNG.Connection.Protocol
 							}
 						}
 					}
-							
+
 					arguments.Add("-P", InterfaceControl.Info.Port.ToString());
 					arguments.Add(InterfaceControl.Info.Hostname);
 				}
-						
+
 				if (_isPuttyNg)
 				{
 					arguments.Add("-hwndparent", InterfaceControl.Handle.ToString());
 				}
-						
+
 				PuttyProcess.StartInfo.Arguments = arguments.ToString();
-						
+
 				PuttyProcess.EnableRaisingEvents = true;
 				PuttyProcess.Exited += ProcessExited;
-						
+
 				PuttyProcess.Start();
 				PuttyProcess.WaitForInputIdle(Settings.Default.MaxPuttyWaitTime * 1000);
-						
+
 				var startTicks = Environment.TickCount;
 				while (PuttyHandle.ToInt32() == 0 & Environment.TickCount < startTicks + Settings.Default.MaxPuttyWaitTime * 1000)
 				{
@@ -153,17 +153,17 @@ namespace mRemoteNG.Connection.Protocol
 						Thread.Sleep(0);
 					}
 				}
-						
+
 				if (!_isPuttyNg)
 				{
 					NativeMethods.SetParent(PuttyHandle, InterfaceControl.Handle);
 				}
-						
+
 				Runtime.MessageCollector.AddMessage(MessageClass.InformationMsg, Language.strPuttyStuff, true);
 				Runtime.MessageCollector.AddMessage(MessageClass.InformationMsg, string.Format(Language.strPuttyHandle, PuttyHandle), true);
 				Runtime.MessageCollector.AddMessage(MessageClass.InformationMsg, string.Format(Language.strPuttyTitle, PuttyProcess.MainWindowTitle), true);
 				Runtime.MessageCollector.AddMessage(MessageClass.InformationMsg, string.Format(Language.strPuttyParentHandle, InterfaceControl.Parent.Handle), true);
-						
+
 				Resize(this, new EventArgs());
 				base.Connect();
 				return true;
@@ -174,7 +174,7 @@ namespace mRemoteNG.Connection.Protocol
 				return false;
 			}
 		}
-				
+
 		public override void Focus()
 		{
 			try
@@ -190,7 +190,7 @@ namespace mRemoteNG.Connection.Protocol
 				Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg, Language.strPuttyFocusFailed + Environment.NewLine + ex.Message, true);
 			}
 		}
-				
+
 		public override void Resize(object sender, EventArgs e)
 		{
 			try
@@ -199,14 +199,29 @@ namespace mRemoteNG.Connection.Protocol
 				{
 					return;
 				}
-                NativeMethods.MoveWindow(PuttyHandle, -SystemInformation.FrameBorderSize.Width, -(SystemInformation.CaptionHeight + SystemInformation.FrameBorderSize.Height), InterfaceControl.Width + SystemInformation.FrameBorderSize.Width * 2, InterfaceControl.Height + SystemInformation.CaptionHeight + SystemInformation.FrameBorderSize.Height * 2, true);
-			}
+
+                if (_isPuttyNg)
+                {
+                    // PuTTYNG 0.70.0.1 and later doesn't have any window borders
+                    NativeMethods.MoveWindow(PuttyHandle, 0, 0, InterfaceControl.Width, InterfaceControl.Height, true);
+                }
+                else
+                {
+                    var left = -(SystemInformation.FrameBorderSize.Width + SystemInformation.HorizontalResizeBorderThickness);
+                    var top = -(SystemInformation.CaptionHeight + SystemInformation.FrameBorderSize.Height + SystemInformation.VerticalResizeBorderThickness);
+                    var width = InterfaceControl.Width + (SystemInformation.FrameBorderSize.Width + SystemInformation.HorizontalResizeBorderThickness) * 2;
+                    var height = InterfaceControl.Height + SystemInformation.CaptionHeight + (SystemInformation.FrameBorderSize.Height +
+                                  SystemInformation.VerticalResizeBorderThickness) * 2;
+
+                    NativeMethods.MoveWindow(PuttyHandle, left, top, width, height, true);
+                }
+            }
 			catch (Exception ex)
 			{
 				Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg, Language.strPuttyResizeFailed + Environment.NewLine + ex.Message, true);
 			}
 		}
-				
+
 		public override void Close()
 		{
 			try
@@ -220,7 +235,7 @@ namespace mRemoteNG.Connection.Protocol
 			{
 				Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg, Language.strPuttyKillFailed + Environment.NewLine + ex.Message, true);
 			}
-					
+
 			try
 			{
 				PuttyProcess.Dispose();
@@ -229,10 +244,10 @@ namespace mRemoteNG.Connection.Protocol
 			{
 				Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg, Language.strPuttyDisposeFailed + Environment.NewLine + ex.Message, true);
 			}
-					
+
 			base.Close();
 		}
-				
+
 		public void ShowSettingsDialog()
 		{
 			try
@@ -246,7 +261,7 @@ namespace mRemoteNG.Connection.Protocol
 			}
 		}
         #endregion
-				
+
         #region Enums
 
 	    protected enum Putty_Protocol

mRemoteV1/Connection/Protocol/RDP/RdpProtocol.cs

@@ -316,10 +316,19 @@ namespace mRemoteNG.Connection.Protocol.RDP
 				return;
 			}
 
-		    var size = !Fullscreen ? Control.Size : Screen.FromControl(Control).Bounds.Size;
+		    try
+		    {
+                Runtime.MessageCollector.AddMessage(MessageClass.DebugMsg, $"Resizing RDP connection to host '{_connectionInfo.Hostname}'");
+		        var size = !Fullscreen ? Control.Size : Screen.FromControl(Control).Bounds.Size;
 
-            IMsRdpClient8 msRdpClient8 = _rdpClient;
-			msRdpClient8.Reconnect((uint)size.Width, (uint)size.Height);
+                IMsRdpClient8 msRdpClient8 = _rdpClient;
+			    msRdpClient8.Reconnect((uint)size.Width, (uint)size.Height);
+		    }
+		    catch (Exception ex)
+		    {
+                Runtime.MessageCollector.AddExceptionMessage(string.Format(Language.ChangeConnectionResolutionError, _connectionInfo.Hostname),
+                    ex, MessageClass.WarningMsg, false);
+		    }
 		}
 				
 		private void SetRdGateway()
@@ -346,9 +355,12 @@ namespace mRemoteNG.Connection.Protocol.RDP
 					{
 						if (_connectionInfo.RDGatewayUseConnectionCredentials == RDGatewayUseConnectionCredentials.Yes)
 						{
-						    _rdpClient.TransportSettings2.GatewayUsername = _connectionInfo.Username;
-						    _rdpClient.TransportSettings2.GatewayPassword = _connectionInfo.Password;
-						    _rdpClient.TransportSettings2.GatewayDomain = _connectionInfo?.Domain;
+							var userName = GetUserName(_connectionInfo?.Username ?? "");
+							var domain = GetDomain(_connectionInfo?.Domain ?? "");
+
+							_rdpClient.TransportSettings2.GatewayUsername = userName;
+							_rdpClient.TransportSettings2.GatewayDomain = domain;
+							_rdpClient.TransportSettings2.GatewayPassword = GetPassword((_connectionInfo?.Password ?? ""), userName, domain, _connectionInfo.Hostname);
 						}
 						else if (_connectionInfo.RDGatewayUseConnectionCredentials == RDGatewayUseConnectionCredentials.SmartCard)
 						{
@@ -356,11 +368,14 @@ namespace mRemoteNG.Connection.Protocol.RDP
 						}
 						else
 						{
-                            _rdpClient.TransportSettings2.GatewayUsername = _connectionInfo.RDGatewayUsername;
-                            _rdpClient.TransportSettings2.GatewayPassword = _connectionInfo.RDGatewayPassword;
-                            _rdpClient.TransportSettings2.GatewayDomain = _connectionInfo.RDGatewayDomain;
-                            _rdpClient.TransportSettings2.GatewayCredSharing = 0;
-                        }
+							var userName = GetUserName(_connectionInfo.RDGatewayUsername);
+							var domain = GetDomain(_connectionInfo.RDGatewayDomain);
+
+							_rdpClient.TransportSettings2.GatewayUsername = userName;
+							_rdpClient.TransportSettings2.GatewayDomain = domain;
+							_rdpClient.TransportSettings2.GatewayPassword = GetPassword(_connectionInfo.RDGatewayPassword, userName, domain, _connectionInfo.Hostname);
+							_rdpClient.TransportSettings2.GatewayCredSharing = 0;
+						}
 					}
 				}
 			}
@@ -407,7 +422,60 @@ namespace mRemoteNG.Connection.Protocol.RDP
 				Runtime.MessageCollector.AddExceptionStackTrace(Language.strRdpSetConsoleSessionFailed, ex);
 			}
 		}
-				
+
+		private string GetUserName(string userName)
+		{
+			if (string.IsNullOrEmpty(userName))
+			{
+				if (Settings.Default.EmptyCredentials == "windows")
+				{
+					userName = Environment.UserName;
+				}
+				else if (Settings.Default.EmptyCredentials == "custom" || Settings.Default.EmptyCredentials == "admpwd")
+				{
+					userName = Settings.Default.DefaultUsername;
+				}
+			}
+			return userName;
+		}
+		private string GetDomain(string domain)
+		{
+			if (string.IsNullOrEmpty(domain))
+			{
+				if (Settings.Default.EmptyCredentials == "windows")
+				{
+					domain = Environment.UserDomainName;
+				}
+				else if (Settings.Default.EmptyCredentials == "custom" || Settings.Default.EmptyCredentials == "admpwd")
+				{
+					domain = Settings.Default.DefaultDomain;
+				}
+			}
+			return domain;
+		}
+		private string GetPassword(string password, string userName, string domain, string host)
+		{
+			if (string.IsNullOrEmpty(password))
+			{
+				if (Settings.Default.EmptyCredentials == "custom")
+				{
+					if (Settings.Default.DefaultPassword != "")
+					{
+						var cryptographyProvider = new LegacyRijndaelCryptographyProvider();
+						password = cryptographyProvider.Decrypt(Settings.Default.DefaultPassword, Runtime.EncryptionKey);
+					}
+				}
+				if (Settings.Default.EmptyCredentials == "admpwd")
+				{
+					if (domain == ".")
+						password = AdmPwd.PDSUtils.PdsWrapper.GetPassword(null, host, AdmPwd.Types.IdentityType.LocalComputerAdmin, false, false).Password;
+					else
+						password = AdmPwd.PDSUtils.PdsWrapper.GetPassword(domain, userName, AdmPwd.Types.IdentityType.ManagedDomainAccount, false, false).Password;
+				}
+			}
+			return password;
+		}
+
 		private void SetCredentials()
 		{
 			try
@@ -417,57 +485,13 @@ namespace mRemoteNG.Connection.Protocol.RDP
 					return;
 				}
 
-			    var userName = _connectionInfo?.Username ?? "";
-			    var password = _connectionInfo?.Password ?? "";
-			    var domain = _connectionInfo?.Domain ?? "";
-						
-				if (string.IsNullOrEmpty(userName))
-				{
-					if (Settings.Default.EmptyCredentials == "windows")
-					{
-						_rdpClient.UserName = Environment.UserName;
-					}
-					else if (Settings.Default.EmptyCredentials == "custom")
-					{
-						_rdpClient.UserName = Settings.Default.DefaultUsername;
-					}
-				}
-				else
-				{
-					_rdpClient.UserName = userName;
-				}
-						
-				if (string.IsNullOrEmpty(password))
-				{
-					if (Settings.Default.EmptyCredentials == "custom")
-					{
-						if (Settings.Default.DefaultPassword != "")
-						{
-                            var cryptographyProvider = new LegacyRijndaelCryptographyProvider();
-                            _rdpClient.AdvancedSettings2.ClearTextPassword = cryptographyProvider.Decrypt(Settings.Default.DefaultPassword, Runtime.EncryptionKey);
-						}
-					}
-				}
-				else
-				{
-					_rdpClient.AdvancedSettings2.ClearTextPassword = password;
-				}
-						
-				if (string.IsNullOrEmpty(domain))
-				{
-					if (Settings.Default.EmptyCredentials == "windows")
-					{
-						_rdpClient.Domain = Environment.UserDomainName;
-					}
-					else if (Settings.Default.EmptyCredentials == "custom")
-					{
-						_rdpClient.Domain = Settings.Default.DefaultDomain;
-					}
-				}
-				else
-				{
-					_rdpClient.Domain = domain;
-				}
+				var userName = GetUserName(_connectionInfo?.Username ?? "");
+				var domain = GetDomain(_connectionInfo?.Domain ?? "");
+
+				_rdpClient.Domain = domain;
+				_rdpClient.UserName = userName;
+				_rdpClient.AdvancedSettings2.ClearTextPassword = GetPassword((_connectionInfo?.Password ?? ""), userName, domain, _connectionInfo.Hostname);
+
 			}
 			catch (Exception ex)
 			{
@@ -916,17 +940,25 @@ namespace mRemoteNG.Connection.Protocol.RDP
         #region Reconnect Stuff
 		public void tmrReconnect_Elapsed(object sender, System.Timers.ElapsedEventArgs e)
 		{
-			var srvReady = PortScanner.IsPortOpen(_connectionInfo.Hostname, Convert.ToString(_connectionInfo.Port));
+		    try
+		    {
+			    var srvReady = PortScanner.IsPortOpen(_connectionInfo.Hostname, Convert.ToString(_connectionInfo.Port));
 					
-			ReconnectGroup.ServerReady = srvReady;
+			    ReconnectGroup.ServerReady = srvReady;
 					
-			if (ReconnectGroup.ReconnectWhenReady && srvReady)
-			{
-				tmrReconnect.Enabled = false;
-				ReconnectGroup.DisposeReconnectGroup();
-				//SetProps()
-				_rdpClient.Connect();
-			}
+			    if (ReconnectGroup.ReconnectWhenReady && srvReady)
+			    {
+				    tmrReconnect.Enabled = false;
+				    ReconnectGroup.DisposeReconnectGroup();
+				    //SetProps()
+				    _rdpClient.Connect();
+			    }
+		    }
+		    catch (Exception ex)
+		    {
+                Runtime.MessageCollector.AddExceptionMessage(string.Format(Language.AutomaticReconnectError, _connectionInfo.Hostname),
+                    ex, MessageClass.WarningMsg, false);
+		    }
 		}
         #endregion
 	}

mRemoteV1/Container/ContainerInfo.cs

@@ -12,13 +12,19 @@ namespace mRemoteNG.Container
 	[DefaultProperty("Name")]
     public class ContainerInfo : ConnectionInfo, INotifyCollectionChanged
 	{
-        [Browsable(false)]
+	    private bool _isExpanded;
+
+	    [Browsable(false)]
         public List<ConnectionInfo> Children { get; } = new List<ConnectionInfo>();
 
-        [Category(""), Browsable(false), ReadOnly(false), Bindable(false), DefaultValue(""), DesignOnly(false)]
-        public bool IsExpanded { get; set; }
+	    [Category(""), Browsable(false), ReadOnly(false), Bindable(false), DefaultValue(""), DesignOnly(false)]
+	    public bool IsExpanded
+	    {
+	        get => _isExpanded;
+	        set => SetField(ref _isExpanded, value, "IsExpanded");
+	    }
 
-        [Browsable(false)]
+	    [Browsable(false)]
 	    public override bool IsContainer { get { return true; } set {} }
 
 	    public ContainerInfo(string uniqueId)

mRemoteV1/Docs/PDSConfigWrapper.xml

@@ -0,0 +1,357 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!--Management interface-->
+<PdsConfigWrapper>
+  <GetPds>
+    <summary>
+      Returns list of PDS discovered either form DNS or from GPO
+    </summary>
+    <returns>Returns list of PDS instances discovered</returns>
+    <remarks>
+      <para>No specific permissions required</para>
+      <para>Call is not audited</para>
+    </remarks>
+  </GetPds>
+  <GetSupportedForest>
+    <summary>
+      Calls PDS to get list of supported forests as configured in PDS configuration file.
+    </summary>
+    <param name="Pds">
+      Identifies PDS instance to query list of supported forests.
+    </param>
+    <returns>List of names of AD forests as known by given PDS instance (optionaly with connection credentials and id of enryption key that is used to protect them is configuration file), or null if no specific AD forests are configured and PDS just covers local AD forest.</returns>
+    <remarks>
+      <para>PDS Admin role is required to successfully call this method</para>
+      <para>Call is audited</para>
+    </remarks>
+  </GetSupportedForest>
+  <AddSupportedForest>
+    <summary>
+      Calls PDS to add new AD forest to list of supported forests.
+    </summary>
+    <param name="Pds">
+      Identifies PDS instance that will be target of the operation. If operating more intances of PDS, supported AD forest must be added to each of them, so as PDS configuration is consistent across all instances.
+    </param>
+    <param name="Forest">
+      Specifies parameters of the newly supported forest
+    </param>
+    <returns>Newly added supported forest.</returns>
+    <remarks>
+      <para>PDS Admin role is required to successfully call this method</para>
+      <para>Call is audited</para>
+    </remarks>
+  </AddSupportedForest>
+  <SetSupportedForest>
+    <summary>
+      Calls PDS to update supported forest parameters (typically connection credentials).
+    </summary>
+    <param name="Pds">
+      Identifies PDS instance to perform the operation on. If operating more intances of PDS, update must be performed on each of them to ensure consistency of configuration across all instances of PDS.
+    </param>
+    <param name="Forest">
+      Specifies parameters to be updated on the forest
+    </param>
+    <returns>Updated supported forest.</returns>
+    <remarks>
+      <para>PDS Admin role is required to successfully call this method</para>
+      <para>Call is audited</para>
+    </remarks>
+  </SetSupportedForest>
+  <RemoveSupportedForest>
+    <summary>
+      Calls PDS to add remove AD forest from list of supported forests.
+    </summary>
+    <param name="Pds">
+      Identifies PDS instance to remove the forest from list of supported forests. If operating more intances of PDS, supported AD forest must be removed from each of them.
+    </param>
+    <param name="Forest">
+      Specifies parameters of the removed forest. Only DNS name of Forest is used to identify forest to be removed.
+    </param>
+    <returns>Removed forest.</returns>
+    <remarks>
+      <para>PDS Admin role is required to successfully call this method</para>
+      <para>Call is audited</para>
+    </remarks>
+  </RemoveSupportedForest>
+  <AddSidMapping>
+    <summary>
+      Calls PDS to add maping of security principal from untrusted forest to security principal from trusted forest.
+    </summary>
+    <param name="Pds">
+      Identifies PDS instance to work with. If operating more intances of PDS, SID mapping must be added to each of them to ensure configuration consistency.
+    </param>
+    <param name="Mapping">
+      Specifies parameters of the SID mapping.
+    </param>
+    <returns></returns>
+    <remarks>
+      <para>PDS Admin role is required to successfully call this method</para>
+      <para>Call is audited</para>
+    </remarks>
+  </AddSidMapping>
+  <UpdateSidMapping>
+    <summary>
+      Calls PDS to modify maping of security principal from untrusted forest to security principal from trusted forest.
+    </summary>
+    <param name="Pds">
+      Identifies PDS instance to work with. If operating more intances of PDS, SID mapping must be updated on each of them to ensure configuration consistency.
+    </param>
+    <param name="Mapping">
+      Specifies parameters of the SID mapping.
+    </param>
+    <returns></returns>
+    <remarks>
+      <para>PDS Admin role is required to successfully call this method</para>
+      <para>Call is audited</para>
+    </remarks>
+  </UpdateSidMapping>
+  <GetSidMapping>
+    <summary>
+      Calls PDS to get configured mapings of security principal from untrusted forest to security principal from trusted forest.
+    </summary>
+    <param name="Pds">
+      Identifies PDS instance to work with.
+    </param>
+    <returns>List of configured SID mappings</returns>
+    <remarks>
+      <para>Can be called by any authenticated user</para>
+      <para>Call is not audited</para>
+    </remarks>
+  </GetSidMapping>
+  <RemoveSidMapping>
+    <summary>
+      Calls PDS to add remove SID mappings from list of mappings.
+    </summary>
+    <param name="Pds">
+      Identifies PDS instance to remove the mapping from. If operating more intances of PDS, mapping must be removed from each of them.
+    </param>
+    <param name="PrimarySid">
+      Specifies Primary SID of mapping to be removed.
+    </param>
+    <returns></returns>
+    <remarks>
+      <para>PDS Admin role is required to successfully call this method</para>
+      <para>Call is audited</para>
+    </remarks>
+  </RemoveSidMapping>
+  <AddManagedAccountsContainer>
+    <summary>
+      Calls PDS to add AD container with accounts with automatically managed password.
+    </summary>
+    <param name="Pds">
+      Identifies PDS instance to work with. If operating more intances of PDS, container must be added to configuration of each of them to ensure configuration consistency.
+    </param>
+    <param name="Container">
+      Specifies parameters of password for accounts located in AD container.
+    </param>
+    <returns></returns>
+    <remarks>
+      <para>PDS Admin role is required to successfully call this method</para>
+      <para>Call is audited</para>
+    </remarks>
+  </AddManagedAccountsContainer>
+  <GetManagedAccountsContainer>
+    <summary>
+      Calls PDS to retrieve configuration of AD containers with accounts with automatically managed password.
+    </summary>
+    <param name="Pds">
+      Identifies PDS instance to work with.
+    </param>
+    <returns>List of managed domain acocunts containers as defined in PDS configuration file.</returns>
+    <remarks>
+      <para>Can be called by any authenticated user</para>
+      <para>Call is not audited</para>
+    </remarks>
+  </GetManagedAccountsContainer>
+  <SetManagedAccountsContainer>
+    <summary>
+      Calls PDS to update configuration of AD container with accounts with automatically managed password.
+    </summary>
+    <param name="Pds">
+      Identifies PDS instance to work with. If operating more intances of PDS, container must be updated on each of them to ensure configuration consistency.
+    </param>
+    <param name="Container">
+      Specifies parameters of password for accounts located in given AD container.
+    </param>
+    <returns></returns>
+    <remarks>
+      <para>PDS Admin role is required to successfully call this method</para>
+      <para>Call is audited</para>
+    </remarks>
+  </SetManagedAccountsContainer>
+  <RemoveManagedAccountsContainer>
+    <summary>
+      Calls PDS to remove AD container with accounts with automatically managed password from PDS configuration.
+    </summary>
+    <param name="Pds">
+      Identifies PDS instance to work with. If operating more intances of PDS, container must be removed from each of them to ensure configuration consistency.
+    </param>
+    <param name="DN">
+      Specifies distinguishedName of container to be removed from configuration.
+    </param>
+    <returns></returns>
+    <remarks>
+      <para>PDS Admin role is required to successfully call this method</para>
+      <para>Call is audited</para>
+    </remarks>
+  </RemoveManagedAccountsContainer>
+  <TransferPdsAdminRole>
+    <summary>
+      Transfers PDS Admin role to security principal (user or group)
+    </summary>
+    <param name="Pds">
+      <para>Identifies PDS instance to work with.</para>
+      <para>Important: If operating more intances of PDS, configuration change must be performed on each of them to ensure configuration consistency.</para>
+    </param>
+    <param name="NewRoleHolder">
+      Name of new holder of PDS Admin role. Should include domain name.
+    </param>
+    <returns></returns>
+    <remarks>
+      <para>PDS Admin role is required to successfully call this method</para>
+      <para>Call is audited</para>
+    </remarks>
+  </TransferPdsAdminRole>
+  <UpdateManagedAccountsParameters>
+    <summary>
+      Updates global configuration of managed domain accounts processing.<br/>
+      Note: Currently, only global parameter supported is interval of scanning of managed domain accounts for password expiration.
+    </summary>
+    <param name="Pds">
+      <para>Identifies PDS instance to work with.</para>
+      <para>Important: If operating more intances of PDS, configuration change must be performed on each of them to ensure configuration consistency.</para>
+    </param>
+    <param name="ManagementInterval">
+      Interval of scanning of managed domain accounts for password expiration.
+    </param>
+    <returns></returns>
+    <remarks>
+      <para>PDS Admin role is required to successfully call this method</para>
+      <para>Call is audited</para>
+    </remarks>
+  </UpdateManagedAccountsParameters>
+  <GetManagedAccountsParameters>
+    <summary>
+      Returns global configuration of managed domain accounts processing.<br/>
+      Note: Currently, only global parameter supported is interval of scanning of managed domain accounts for password expiration.
+    </summary>
+    <param name="Pds">
+      Identifies PDS instance to work with.
+    </param>
+    <returns>Global configuration of managed domain accounts processing.</returns>
+    <remarks>
+    </remarks>
+  </GetManagedAccountsParameters>
+  <GetDnsParameters>
+    <summary>
+      Returns parameters of DNS registration for PDS autodiscover SRV records.
+    </summary>
+    <param name="Pds">
+      Identifies PDS instance to work with.
+    </param>
+    <returns>
+      <see cref="DnsParameters"/> object.
+    </returns>
+    <remarks>
+    </remarks>
+  </GetDnsParameters>
+  <UpdateDnsParameters>
+    <summary>
+      Updates parameters of DNS registration for PDS autodiscover SRV records.
+    </summary>
+    <param name="Pds">
+      <para>Identifies PDS instance to work with.</para>
+      <para>Important: If operating more intances of PDS, configuration change must be performed on each of them to ensure configuration consistency.</para>
+    </param>
+    <param name="Priority">Priority of SRV record. Null means default, which is 100.</param>
+    <param name="RegistrationInterval">How often PDS service re-registers autodiscover record to prevent its expiration. Null means default, which is 86400 seconds (1 day).</param>
+    <param name="Ttl">Time-to-live for registered SRV record. Null means default, which is 1200 seconds (20 minutes)</param>
+    <param name="UnregisterOnShutdown">Whether or not the SRV record shall be unregistered then services stops, to prevent autodiscover records pointing to non-operating PDS instance. Null means default, which is 'true'</param>
+    <param name="Weight">Weight of registered SRV record.<br/>
+    Note: Weight is not used by the solution.
+    </param>
+    <returns>
+    </returns>
+    <remarks>
+      <para>PDS Admin role is required to successfully call this method</para>
+      <para>Call is audited</para>
+    </remarks>
+  </UpdateDnsParameters>
+  <UpdateAccessControlParameters>
+    <summary>
+      Updates parameters of access control process for password reads and resets.
+    </summary>
+    <param name="Pds">
+      <para>Identifies PDS instance to work with.</para>
+      <para>Important: If operating more intances of PDS, configuration change must be performed on each of them to ensure configuration consistency.</para>
+    </param>
+    <param name="HonorAllExtendedRightsPermission">Whether 'All extended rights' permission also includes 'Read password' and 'Reset password' permission.Null means default, which is 'false'.</param>
+    <param name="HonorFullControlPermission">Whether 'Full control' permission also includes 'Read password' and 'Reset password' permission.Null means default, which is 'false'.</param>
+    <param name="HonorLocalGroupsFromRemoteComputerDomain">
+      <para>
+        Whether PDS also evaluates membership in local groups from remote domain.
+      </para>
+      <para>
+        Consider the following scenario:
+        <list>
+          <item>PDS is installed in forest domain A</item>
+          <item>Computer account X we want know admin password for is in forest domain B</item>
+          <item>User U who wants to know admin password for computer X is also in forest domain B</item>
+          <item>User U is member of Domain local group DLG</item>
+          <item>Permission to read the admin password for computer X is delegated to group DLG</item>
+        </list>
+        In this case, when PDS is performing access check, it normally does NOT see user U being member of group DLG (because membership in Domain Local groups is not propagated to other domains in forest), and because of that, it replies with AccessDenied error. Setting this parameter to true makes PDS to perform direct lookup for local group membership of user in his home domain to make sure that complete membership is evaluated. 
+        This additional lookup consumes PDS service resources and requires direct connection between PDS and domain controller of user's domain, so delegation using domain Local groups in multi-forest domains should be avoided.
+      </para>
+    </param>
+    <param name="MandatoryGroupSids">List of Security Identifiers (SIDs) that caller additionally must be member of for calls to password reads/resets to succeed. Membership in such groups is then additional gate that allows to perform active operations. If multiple groups specified, user must be member of at least 1 of them. This helps implement additional levels of access control, such as JIT of Authentication Mechanism Assurance (AMA)</param>
+    <returns>
+    </returns>
+    <remarks>
+      <para>PDS Admin role is required to successfully call this method</para>
+      <para>Call is audited</para>
+    </remarks>
+  </UpdateAccessControlParameters>
+  <GetAccessControlsParameters>
+    <summary>
+      Returns parameters of access control process for password reads and resets.
+    </summary>
+    <param name="Pds">
+      Identifies PDS instance to work with.
+    </param>
+    <returns>
+      <see cref="AccessControlParameters"/> object.
+    </returns>
+    <remarks>
+    </remarks>
+  </GetAccessControlsParameters>
+  <GetLicenseParameters>
+    <summary>
+      Returns parameters of current license, including path to license file.
+    </summary>
+    <param name="Pds">
+      Identifies PDS instance to work with.
+    </param>
+    <returns>
+      <see cref="LicenseParameters"/> object.
+    </returns>
+    <remarks>
+    </remarks>
+  </GetLicenseParameters>
+  <UpdateLicenseFilePath>
+    <summary>
+      Updates path to license file.
+    </summary>
+    <param name="Pds">
+      Identifies PDS instance to work with.
+    </param>
+    <param name="FilePath">
+      Absolute or relative path to license file that Pds instance shall use.
+    </param>
+    <returns>
+      <see cref="LicenseParameters"/> object.
+    </returns>
+    <remarks>
+    </remarks>
+  </UpdateLicenseFilePath>
+
+</PdsConfigWrapper>

mRemoteV1/Docs/PdsWrapper.xml

@@ -0,0 +1,374 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<PdsWrapper>
+  <UpsertSupportedForest>
+    <summary>
+      Calls PDS to request add or update supported forest to configuration file in PDS.
+    </summary>
+    <param name="ForestName">
+      Name of new or update supported forest.
+    </param>
+    <param name="User">
+      Name of account which use for ldap connection to supported forest.
+      Account name can be passed as one of the following:
+      <list type="bullet">
+        <item>sAMAccountName (with domain)</item>
+        <item>userPrincipalName</item>
+      </list>
+      <para>Together with parameter "User" must set parameters "Password" and "KeyId".</para>
+    </param>
+    <param name="Password">
+      Password for account which use for ldap connection to supported forest.
+      <para>Together with parameter "Password" must set parameters "User" and "KeyId".</para>
+    </param>
+    <param name="KeyId">
+      Identifies key pair to which the password is encrypted.
+      <para>Together with parameter "KeyId" must set parameters "User" and "Password".</para>
+    </param>
+    <returns>List of PDS instances where added or updated supported forest.</returns>
+    <para>When parameter User, Password and KeyID are not set, use default PDS credentials</para>
+    <para>
+      Caller must have PDS Admin role. For callers without role, AccessDenied exception is thrown. To find out, if caller has PDS Admin role, call method <see cref="IsPDSAdmin"/>.
+    </para>
+    <para>By default, PDS Admin role is assigned to Enterprise Admins group and can be changed via PDS configuration file.</para>
+    <para>Call is audited on PDS</para>
+  </UpsertSupportedForest>
+  <ResetManagedAccountPassword>
+     <summary>
+       Calls PDS to request reset of managed account password in given AD forest.
+    </summary>
+     <param name="ForestName">
+      Name of AD forest.
+       <para>
+         Forest must be marked as supported in PDS configuration.
+         For local forest (forest where PDS is installed), you can pass null as parameter value
+      </para>
+    </param>
+     <param name="AccountName">
+      Name of account where password shall be reset.
+       Account name can be passed as one of the following:
+         * sAMAccountName (without domain)
+         * userPrincipalName
+         * distinguishedName
+    </param>
+     <param name="WhenEffective">When password reset shall occur. Password will be reset during next PDS management cycle - see passwordManagementInterval in PDS config file.</param>
+     <returns>Information about result of operation along with account name and DN</returns>
+     <remarks>
+       <para>
+        PDS does not try to guess domain or forest name from account name - it searches against Global Catalog interface of AD forest passed in <paramref name="ForestName"/> parameter
+      </para>
+       <para>Caller must have Reset Local Admin Passsword permission on given managed account object</para>
+       <para>Call is audited on PDS</para>
+    </remarks>
+  </ResetManagedAccountPassword>
+  <GetEnvironmentStats>
+     <summary>
+       Calls PDs to retrieve environment status for managed environment:
+       * List of domains in each managed forest, along with number of managed machines and domain accounts in each domain
+       * Overall status for each AD forest, including license expiration and consumption
+    </summary>
+     <returns>Environment status for the solution</returns>
+     <remarks>
+       <para>No specific permissions required</para>
+       <para>Call is not audited</para>
+    </remarks>
+  </GetEnvironmentStats>
+  <GetUserPermissions>
+     <summary>
+       Calls PDS to retrieve information about AdmPwd.E permissions that given user has on computer object, as seen by PDS
+    </summary>
+     <param name="ForestName">
+      Name of AD forest.
+       Forest must be marked as supported in PDS configuration.
+       For local forest, pass null as parameter value
+    </param>
+     <param name="ComputerName">Name of computer where password of local admin account shall be reset</param>
+     <param name="UserUpn">UserPrincipalName of user in question.</param>
+     <returns>List of solution specific permissions PDS finds for given user for given computer object </returns>
+     <remarks>
+       <para>This method uses Kerberos S2U4Self logon to obtain user's Kerberos ticket with security group membership of user account in question</para>
+       <para>No specific permissions required</para>
+       <para>Call is not audited</para>
+    </remarks>
+  </GetUserPermissions>
+  <GetKeyAdminsRoleName>
+     <summary>
+       Calls PDS to retrieve name of AD group that implements Key Admin role. Members of the group hold Key Admin role on PDS
+    </summary>
+     <returns>Returns name of AD group that is configured on PDS as Key Admin role group</returns>
+     <remarks>
+       <para>By default, this role is held by Enterprise Admins group. Role assignment can be changed in PDS configuration file.</para>
+       <para>No specific permissions required</para>
+       <para>Call is not audited</para>
+    </remarks>
+  </GetKeyAdminsRoleName>
+  <GetSupportedKeySizes>
+     <summary>
+       Calls PDS to retrieve key sizes supported by PDS.
+    </summary>
+     <returns>List of supported key sizes, in bits</returns>
+     <remarks>
+       <para>
+        PDS only creates key pairs of supported sizes; however it can decrypt passwords encrypted by any valid RSA key - see <see cref="GenerateKeyPair"/> method to see how to generate new key pair
+      </para>
+       <para>Supported key sizes are configured in PDS configuration file.</para>
+       <para>RSA CSP used by solution supports key sizes up to 16384 bits in 8-bit increments on Windows OS.</para>
+       <para>No specific permissions required</para>
+       <para>Call is not audited</para>
+    </remarks>
+  </GetSupportedKeySizes>
+  <IsPDSAdmin>
+     <summary>
+       Calls PDS to return information whether or not the caller is in Key Admin role on PDS
+    </summary>
+     <returns>True if caller is in Key Admin role on PDS. Otherwise returns false.</returns>
+     <remarks>
+       <para>Can be used by various client tools to properly render UI and allow users in KeyAdmin role to see key pair management UI</para>
+       <para>No specific permissions required</para>
+       <para>Call is not audited</para>
+    </remarks>
+  </IsPDSAdmin>
+  <GetManagedAccountPassword>
+     <summary>
+       Retrieves password of managed account in given AD forest.
+    </summary>
+     <param name="ForestName">
+       Name of AD forest.
+       <para>
+        Forest must be marked as supported in PDS configuration.
+         For local forest (forest where PDS is installed), you can pass null as parameter value
+      </para>
+    </param>
+     <param name="AccountName">
+      Name of account where password shall be read.
+       Account name can be passed as one of the following:
+         * sAMAccountName (without domain)
+         * userPrincipalName
+         * distinguishedName
+    </param>
+     <param name="IncludePasswordHistory">Whether or not to include password history</param>
+     <returns>Password, current password expiration time and optional password history</returns>
+     <remarks>
+       <para>
+        PDS does not try to guess domain or forest name from account name - it searches against Global Catalog interface of AD forest passed in <paramref name="ForestName"/> parameter for account as specified in <paramRef name="AccountName"/>
+      </para>
+       <para>Caller must have Read Local Admin Passsword permission on given managed account object</para>
+       <para>Call is audited on PDS</para>
+    </remarks>
+  </GetManagedAccountPassword>
+  <GetPassword>
+     <summary>
+       Calls PDS to retrieve password of managed account in given AD forest.
+       Managed account can be either:
+         * Domain computer local admin account
+         * Managed domain account
+    </summary>
+     <param name="ForestName">
+      Name of AD forest.
+       Forest must be marked as supported in PDS configuration.
+       For local forest, pass null as parameter value
+    </param>
+     <param name="Identity">
+       When retrieving password of computer local admin account, pass name of computer where password of local admin account shall be retrieved. Name of the computer can be passed as one of the following:
+       * Hostname, such as MyComputer
+       * FQDN, such as mycomputer.mydomain.com
+       * Distinguished name, such as cn=MyComputer,ou=MyComputers,dc=mydomain,dc=com
+       <para/>
+       When retrieving password of managed domain account, pas the name of domain account. Account name can be passed as one of the following:
+       * sAMAccountName (without domain)
+       * userPrincipalName
+       * distinguishedName
+     </param>
+     <param name="Type">
+       Type of the account to retrieve password for. Can be one of the supported account types:
+       * LocalComputerAdmin
+       * ManagedDomainAccount
+     </param>
+     <param name="IncludePasswordHistory">Whether or not to include password history</param>
+     <param name="IsDeleted">
+      Whether computer account or managed domain account is deleted or not.
+      Note: there may be multiple deleted objects with the same name. In such case, password for most recently deleted object is returned
+    </param>
+     <returns>Password, current password expiration time and optional password history. Passwords returned are plain text</returns>
+     <remarks>
+       <para>Name of local admin account is not stored by solution. Caller is expected to know name of local managed account</para>
+       <para>
+        PDS does not try to guess domain or forest name from computer name - it searches against Global Catalog interface of AD forest passed in <paramref name="ForestName"/> parameter
+      </para>
+       <para>Caller must have Read Admin Passsword permission on given computer or user object</para>
+       <para>Call is audited on PDS</para>
+    </remarks>
+  </GetPassword>
+  <GetSecurePassword>
+    <summary>
+      Calls PDS to retrieve password of managed account in given AD forest.
+      Managed account can be either:
+      * Domain computer local admin account
+      * Managed domain account
+    </summary>
+    <param name="ForestName">
+      Name of AD forest.
+      Forest must be marked as supported in PDS configuration.
+      For local forest, pass null as parameter value
+    </param>
+    <param name="Identity">
+      When retrieving password of computer local admin account, pass name of computer where password of local admin account shall be retrieved. Name of the computer can be passed as one of the following:
+      * Hostname, such as MyComputer
+      * FQDN, such as mycomputer.mydomain.com
+      * Distinguished name, such as cn=MyComputer,ou=MyComputers,dc=mydomain,dc=com
+      <para/>
+      When retrieving password of managed domain account, pas the name of domain account. Account name can be passed as one of the following:
+      * sAMAccountName (without domain)
+      * userPrincipalName
+      * distinguishedName
+    </param>
+    <param name="Type">
+      Type of the account to retrieve password for. Can be one of the supported account types:
+      * LocalComputerAdmin
+      * ManagedDomainAccount
+    </param>
+    <param name="IncludePasswordHistory">Whether or not to include password history</param>
+    <param name="IsDeleted">
+      Whether computer account or managed domain account is deleted or not.
+      Note: there may be multiple deleted objects with the same name. In such case, password for most recently deleted object is returned
+    </param>
+    <returns>Password, current password expiration time and optional password history. Passwords returned as secure strings</returns>
+    <remarks>
+      <para>Name of local admin account is not stored by solution. Caller is expected to know name of local managed account</para>
+      <para>
+        PDS does not try to guess domain or forest name from computer name - it searches against Global Catalog interface of AD forest passed in <paramref name="ForestName"/> parameter
+      </para>
+      <para>Caller must have Read Admin Passsword permission on given computer or user object</para>
+      <para>Call is audited on PDS</para>
+    </remarks>
+  </GetSecurePassword>
+  <ResetPassword>
+     <summary>
+       Calls PDS to request reset of for given managed account in given AD forest.
+       Managed account can be either:
+       * Domain computer local admin account
+       * Managed domain account
+     </summary>
+     <param name="ForestName">
+      Name of AD forest.
+       Forest must be marked as supported in PDS configuration.
+       For local forest, pass null as parameter value
+     </param>
+     <param name="Identity">Name of computer where password of local admin account shall be reset</param>
+     <param name="Type">
+      Type of the managed account to reset password for. Can be one of the supported account types:
+      * LocalComputerAdmin
+      * ManagedDomainAccount
+     </param>
+     <param name="WhenEffective">When password reset shall occur.
+     If type of account is local computer admin account, then password will be reset during next GPO update cycle on given computer after this time.
+     If type of account is managed domain account, and WhenEffective is in the past, then password is reset immediately. If WhenEffective is in the future, then password will be scheduled for reset according to WhenEffective parameter.
+     </param>
+     <returns>Information about result of operation along with computer name and computer DN</returns>
+     <remarks>
+       <para>Caller must have Reset Admin Passsword permission on given computer or user object</para>
+       <para>Call is audited on PDS</para>
+    </remarks>
+  </ResetPassword>
+  <GetLocalAdminPassword>
+     <summary>
+       Calls PDS to retrieve password of managed local admin account of given computer in given AD forest
+    </summary>
+     <param name="ForestName">
+      Name of AD forest.
+       Forest must be marked as supported in PDS configuration.
+       For local forest, pass null as parameter value
+    </param>
+     <param name="ComputerName">
+      Name of computer where password of local admin account shall be reset. Name of the computer can be passed as one of the following:
+         * Hostname, such as MyComputer
+         * FQDN, such as mycomputer.mydomain.com
+         * Distinguished name, such as cn=MyComputer,ou=MyComputers,dc=mydomain,dc=com
+    </param>
+     <param name="IncludePasswordHistory">Whether or not to include password history</param>
+     <param name="ComputerIsDeleted">
+      Whether computer is deleted or not.
+      Note: there may be multiple deleted computer objects with the same name. In such case, password for most recently deleted computer is returned
+    </param>
+     <returns>Password, current password expiration time and optional password history</returns>
+     <remarks>
+       <para>Name of local admin account is not stored by solution. Caller is expected to know name of local managed account</para>
+       <para>
+        PDS does not try to guess domain or forest name from computer name - it searches against Global Catalog interface of AD forest passed in <paramref name="ForestName"/> parameter
+      </para>
+       <para>Caller must have Read Local Admin Passsword permission on given computer object</para>
+       <para>Call is audited on PDS</para>
+    </remarks>
+  </GetLocalAdminPassword>
+  <ResetLocalAdminPassword>
+     <summary>
+       Calls PDS to request reset of managed local admin password for given computer in given AD forest.
+    </summary>
+     <param name="ForestName">
+      Name of AD forest.
+       Forest must be marked as supported in PDS configuration.
+       For local forest, pass null as parameter value
+    </param>
+     <param name="ComputerName">Name of computer where password of local admin account shall be reset</param>
+     <param name="WhenEffective">When password reset shall occur. Password will be reset during next GPO update cycle on given computer after this time </param>
+     <returns>Information about result of operation along with computer name and computer DN</returns>
+     <remarks>
+       <para>Caller must have Reset Local Admin Passsword permission on given computer object</para>
+       <para>Call is audited on PDS</para>
+    </remarks>
+  </ResetLocalAdminPassword>
+  <GetPublicKeys>
+     <summary>
+       Asks PDS to return public keys for all available key pairs.
+    </summary>
+     <returns>Returns list of all public keys managed by PDS, along with type of the key, size in bits, and key ID</returns>
+     <remarks>
+       <para>No specific permissions required</para>
+       <para>Call is not audited</para>
+    </remarks>
+  </GetPublicKeys>
+    <GetSupportedForestNames>
+     <summary>
+       Asks PDS to return list of all supported AD forests.
+    </summary>
+     <returns>
+       Returns list of names of all supported AD forests.
+      <para>In single forest deployments, list is empty, meaning that only supported forest is the forest where solution is deployed.</para>
+     </returns>
+     <remarks>
+       <para>No specific permissions required</para>
+       <para>Call is not audited</para>
+    </remarks>
+  </GetSupportedForestNames>
+
+  <GetPublicKey>
+     <summary>
+       Asks PDS to return public key with specified key ID
+    </summary>
+     <param name="KeyId">Identifies key pair for which public key is returned</param>
+     <returns>Returns public key of key pair with given KeyID, along with key ID</returns>
+     <remarks>
+       <para>No specific permissions required</para>
+       <para>Call is not audited</para>
+    </remarks>
+  </GetPublicKey>
+  <GenerateKeyPair>
+     <summary>
+       <para>Calls PDS to generate new RSA key pair.</para>
+       <para>
+        PDS keeps private key of key pair in own storage and uses it for password decryption.
+         Public key is put to GPO by an administrator and managed machines use it to encrypt the password of managed local admin account when reporting it to AD.
+      </para>
+       <para>PDS also uses public key to encrypt password of managed domain account - ID of key to use is specified in PDS configuration file.</para>
+    </summary>
+     <param name="KeySize">
+      Specifies desired RSA key size<br/>
+       Key size must be one of those allowed by PDS - see <see cref="GetSupportedKeySizes"/> method
+    </param>
+     <returns>Return public key of newly generated key pair, along with key ID assigned to newly generated key pair</returns>
+     <remarks>
+       <para>Caller must have Key Admin role. For callers without role, AccessDenied exception is thrown. To find out, if caller has Key Admin role, call method <see cref="IsPDSAdmin"/>.</para>
+       <para>By default, Key Admin role is assigned to Enterprise Admins group and can be changed via PDS configuration file.</para>
+       <para>Call is audited on PDS</para>
+    </remarks>
+  </GenerateKeyPair>
+</PdsWrapper>

mRemoteV1/Properties/AssemblyInfo.cs

@@ -14,7 +14,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyDescription("Multi-protocol remote connections manager")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("mRemoteNG")]
-[assembly: AssemblyCopyright("Copyright © 2018 mRemoteNG Dev Team; 2010-2013 Riley McArdle; 2007-2009 Felix Deimel")]
+[assembly: AssemblyCopyright("Copyright © 2019 mRemoteNG Dev Team; 2010-2013 Riley McArdle; 2007-2009 Felix Deimel")]
 [assembly: AssemblyTrademark("")]
 
 [assembly: ComVisible(false)]
@@ -33,5 +33,5 @@ using System.Runtime.InteropServices;
 // by using the '*' as shown below:
 // <Assembly: AssemblyVersion("1.0.*")>
 
-[assembly: AssemblyVersion("1.76.5.*")]
+[assembly: AssemblyVersion("1.76.20.*")]
 [assembly: NeutralResourcesLanguage("en")]

mRemoteV1/Properties/Settings.Designer.cs

@@ -12,7 +12,7 @@ namespace mRemoteNG {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.7.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.4.0.0")]
     internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
         
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
@@ -2103,7 +2103,7 @@ namespace mRemoteNG {
         
         [global::System.Configuration.ApplicationScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("https://mremoteng.org/")]
+        [global::System.Configuration.DefaultSettingValueAttribute("https://gcstoragedownload.blob.core.windows.net/download/mRemoteNG/")]
         public string UpdateAddress {
             get {
                 return ((string)(this["UpdateAddress"]));
@@ -2722,5 +2722,17 @@ namespace mRemoteNG {
                 this["StartUpPanelName"] = value;
             }
         }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("False")]
+        public bool OverrideFIPSCheck {
+            get {
+                return ((bool)(this["OverrideFIPSCheck"]));
+            }
+            set {
+                this["OverrideFIPSCheck"] = value;
+            }
+        }
     }
 }

mRemoteV1/Properties/Settings.settings

@@ -522,7 +522,7 @@
       <Value Profile="(Default)">True</Value>
     </Setting>
     <Setting Name="UpdateAddress" Type="System.String" Scope="Application">
-      <Value Profile="(Default)">https://mremoteng.org/</Value>
+      <Value Profile="(Default)">https://gcstoragedownload.blob.core.windows.net/download/mRemoteNG/</Value>
     </Setting>
     <Setting Name="ConDefaultLoadBalanceInfo" Type="System.String" Scope="User">
       <Value Profile="(Default)" />
@@ -677,5 +677,8 @@
     <Setting Name="StartUpPanelName" Type="System.String" Scope="User">
       <Value Profile="(Default)">General</Value>
     </Setting>
+    <Setting Name="OverrideFIPSCheck" Type="System.Boolean" Scope="User">
+      <Value Profile="(Default)">False</Value>
+    </Setting>
   </Settings>
 </SettingsFile>

mRemoteV1/Resources/Language/Language.es.resx

@@ -59,7 +59,7 @@
             : using a System.ComponentModel.TypeConverter
             : and then encoded with base64 encoding.
     -->
-  <xsd:schema xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root">
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
     <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
     <xsd:element name="root" msdata:IsDataSet="true">
       <xsd:complexType>
@@ -105,17 +105,17 @@
       </xsd:complexType>
     </xsd:element>
   </xsd:schema>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
   <resheader name="resmimetype">
     <value>text/microsoft-resx</value>
   </resheader>
   <resheader name="version">
     <value>2.0</value>
   </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="strAbout" xml:space="preserve">
     <value>Acerca de</value>
@@ -1224,7 +1224,7 @@ Ver el articulo de soporte de Microsoft en http://support.microsoft.com/kb/81183
     <value>Introduzca su dominio.</value>
   </data>
   <data name="strPropertyDescriptionEnableDesktopComposition" xml:space="preserve">
-    <value>Seleccione si emplear composición de escrotorio o no.</value>
+    <value>Seleccione si emplear composición de escritorio o no.</value>
   </data>
   <data name="strPropertyDescriptionEnableFontSmoothing" xml:space="preserve">
     <value>Seleccione si emplear suavizado de fuentes o no.</value>
@@ -2069,4 +2069,4 @@ mRemoteNG ahora se cerrará y comenzará la instalación.</value>
   <data name="strYes" xml:space="preserve">
     <value>Sí</value>
   </data>
-</root>
+</root>

mRemoteV1/Resources/Language/Language.resx

@@ -655,11 +655,11 @@ Starting with new connections file.</value>
     <value>Encryption failed. {0}</value>
   </data>
   <data name="strErrorFipsPolicyIncompatible" xml:space="preserve">
-    <value>The Windows security setting, "System cryptography: Use FIPS compliant algorithms for encryption, hashing, and signing", is enabled. This setting is not compatible with {0}.
+    <value>The Windows security setting, "System cryptography: Use FIPS compliant algorithms for encryption, hashing, and signing", is enabled. 
 
 See the Microsoft Support article at http://support.microsoft.com/kb/811833 for more information.
 
-{0} will now close.</value>
+{0} is not fully FIPS compliant. Click OK to proceed at your own discretion, or Cancel to Exit.</value>
   </data>
   <data name="strErrors" xml:space="preserve">
     <value>Errors</value>
@@ -2694,4 +2694,13 @@ This page will walk you through the process of upgrading your connections file o
   <data name="strUltraVNCSingleClick" xml:space="preserve">
     <value>UltraVNC SingleClick</value>
   </data>
+  <data name="AutomaticReconnectError" xml:space="preserve">
+    <value>An error occurred while trying to reconnect to RDP host '{0}'</value>
+  </data>
+  <data name="ChangeConnectionResolutionError" xml:space="preserve">
+    <value>An error occurred while trying to change the connection resolution to host '{0}'</value>
+  </data>
+  <data name="strUseAdmPwd" xml:space="preserve">
+    <value>Use AdmPwd.E to retrieve the password</value>
+  </data>
 </root>

mRemoteV1/Tools/DisposableAction.cs

@@ -0,0 +1,45 @@
+using System;
+
+namespace mRemoteNG.Tools
+{
+	/// <summary>
+	/// Represents an action that will be executed when the <see cref="Dispose"/>
+	/// method is called. Useful for creating Using blocks around logical start/end
+	/// actions.
+	/// </summary>
+	public class DisposableAction : IDisposable
+	{
+		private bool _isDisposed;
+		private readonly Action _disposeAction;
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="initializeAction">
+		///	An <see cref="Action"/> that should be performed immediately
+		/// when this object is initialized. It should return quickly.
+		/// </param>
+		/// <param name="disposeAction">
+		/// An <see cref="Action"/> to be executed when this object is disposed.
+		/// </param>
+		public DisposableAction(Action initializeAction, Action disposeAction)
+		{
+			initializeAction();
+			_disposeAction = disposeAction;
+		}
+
+		public void Dispose()
+		{
+			Dispose(true);
+		}
+
+		protected virtual void Dispose(bool disposing)
+		{
+			if (!disposing || _isDisposed)
+				return;
+
+			_isDisposed = true;
+			_disposeAction();
+		}
+	}
+}

mRemoteV1/Tools/Extensions.cs

@@ -1,9 +1,11 @@
 
 using System;
+using System.Collections.Generic;
+using System.Linq;
 
 namespace mRemoteNG.Tools
 {
-	public static class Extensions
+    public static class Extensions
 	{
 		public static Optional<T> Maybe<T>(this T value)
 		{
@@ -50,5 +52,23 @@ namespace mRemoteNG.Tools
                 throw new ArgumentException("Value cannot be null or empty", argName);
 	        return value;
 	    }
+
+        /// <summary>
+        /// Perform an action for each item in the given collection. The item
+        /// is the pass along the processing chain.
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="collection"></param>
+        /// <param name="action"></param>
+        /// <returns></returns>
+	    public static IEnumerable<T> ForEach<T>(this IEnumerable<T> collection, Action<T> action)
+        {
+            collection = collection.ToList();
+
+            foreach (var item in collection)
+	            action(item);
+
+	        return collection;
+	    }
 	}
 }

mRemoteV1/Tools/ExternalToolArgumentParser.cs

@@ -182,8 +182,24 @@ namespace mRemoteNG.Tools
                     replacement = _connectionInfo.Password;
                     if (string.IsNullOrEmpty(replacement) && Settings.Default.EmptyCredentials == "custom")
                         replacement = new LegacyRijndaelCryptographyProvider()
-                                        .Decrypt(Convert.ToString(Settings.Default.DefaultPassword),
-                                                                    Runtime.EncryptionKey);
+                            .Decrypt(Convert.ToString(Settings.Default.DefaultPassword),
+                                     Runtime.EncryptionKey);
+                    if (string.IsNullOrEmpty(replacement) && Settings.Default.EmptyCredentials == "admpwd")
+                    {
+                        if (_connectionInfo.Domain == ".")
+                            replacement = AdmPwd.PDSUtils.PdsWrapper.GetPassword(null, _connectionInfo.Hostname, AdmPwd.Types.IdentityType.LocalComputerAdmin, false, false).Password;
+                        else
+                        {
+                            var userName = _connectionInfo.Username;
+                            if (string.IsNullOrEmpty(userName))
+                                if (Settings.Default.EmptyCredentials == "windows")
+                                    userName = Environment.UserName;
+                                else if (Settings.Default.EmptyCredentials == "custom")
+                                    userName = Settings.Default.DefaultUsername;
+
+                            replacement = AdmPwd.PDSUtils.PdsWrapper.GetPassword(_connectionInfo.Domain, userName, AdmPwd.Types.IdentityType.ManagedDomainAccount, false, false).Password;
+                        }
+                    }
                     break;
                 case "domain":
                     replacement = _connectionInfo.Domain;

mRemoteV1/Tools/IeBrowserEmulation.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Diagnostics;
 using System.IO;
+using System.Linq;
 using System.Security.AccessControl;
 using Microsoft.Win32;
 using mRemoteNG.App;
@@ -38,14 +39,16 @@ namespace mRemoteNG.Tools
             {
                 using (var key = Registry.CurrentUser.OpenSubKey(string.Concat("Software\\Wow6432Node\\Microsoft\\Internet Explorer\\Main\\FeatureControl\\", feature), RegistryKeyPermissionCheck.ReadWriteSubTree))
                 {
-                    key?.DeleteValue(appName);
+                    if (key?.GetValueNames().Contains(appName) ?? false)
+                        key.DeleteValue(appName);
                 }
             }
 
 
             using (var key = Registry.CurrentUser.CreateSubKey(string.Concat("Software\\Microsoft\\Internet Explorer\\Main\\FeatureControl\\", feature), RegistryKeyPermissionCheck.ReadWriteSubTree))
             {
-                key?.DeleteValue(appName);
+                if (key?.GetValueNames().Contains(appName) ?? false)
+                    key.DeleteValue(appName);
             }
         }
 #endif

mRemoteV1/Tree/PreviousSessionOpener.cs

@@ -1,8 +1,8 @@
-using System;
-using System.Linq;
-using mRemoteNG.Connection;
+using mRemoteNG.Connection;
 using mRemoteNG.Container;
 using mRemoteNG.UI.Controls;
+using System;
+using System.Linq;
 
 
 namespace mRemoteNG.Tree
@@ -21,7 +21,12 @@ namespace mRemoteNG.Tree
         public void Execute(IConnectionTree connectionTree)
         {
             var connectionInfoList = connectionTree.GetRootConnectionNode().GetRecursiveChildList().Where(node => !(node is ContainerInfo));
-            var previouslyOpenedConnections = connectionInfoList.Where(item => item.PleaseConnect);
+            var previouslyOpenedConnections = connectionInfoList
+                .Where(item => 
+                    item.PleaseConnect && 
+                    // ignore items that have already connected
+                    !_connectionInitiator.ActiveConnections.Contains(item.ConstantID));
+
             foreach (var connectionInfo in previouslyOpenedConnections)
             {
                 _connectionInitiator.OpenConnection(connectionInfo);

mRemoteV1/UI/Controls/Base/NGCheckBox.cs

@@ -68,7 +68,8 @@ namespace mRemoteNG.UI.Controls.Base
             Color fore;
             Color glyph;
             Color checkBorder;
- 
+            if (_themeManager.ActiveTheme == null)
+                return;
             var back = _themeManager.ActiveTheme.ExtendedPalette.getColor("CheckBox_Background");
             if (Enabled)
             {

mRemoteV1/UI/Controls/Base/NGLabel.cs

@@ -23,8 +23,13 @@ namespace mRemoteNG.UI.Controls.Base
         {
             base.OnCreateControl();
             _themeManager = ThemeManager.getInstance();
-            if (_themeManager.ThemingActive)
-            { 
+            if (!_themeManager.ThemingActive) return;
+            // Use the Dialog_* colors since Labels generally have the same colors as panels/dialogs/windows/etc...
+            if (_themeManager.ActiveTheme != null)
+            {
+                BackColor = _themeManager.ActiveTheme.ExtendedPalette.getColor("Dialog_Background");
+                ForeColor = _themeManager.ActiveTheme.ExtendedPalette.getColor("Dialog_Foreground");
+                FontOverrider.FontOverride(this);
                 Invalidate();
             }
         }
@@ -38,8 +43,9 @@ namespace mRemoteNG.UI.Controls.Base
                 return;
             }
 
-            e.Graphics.SmoothingMode = SmoothingMode.AntiAlias;
-            e.Graphics.TextRenderingHint = TextRenderingHint.AntiAlias;
+            // let's use the defaults - this looks terrible in my testing....
+            //e.Graphics.SmoothingMode = SmoothingMode.AntiAlias;
+            //e.Graphics.TextRenderingHint = TextRenderingHint.AntiAlias;
             if (Enabled)
             {
                 TextRenderer.DrawText(e.Graphics, Text, Font, ClientRectangle, ForeColor, TextFormatFlags.Left | TextFormatFlags.VerticalCenter);

mRemoteV1/UI/Controls/Base/NGRadioButton.cs

@@ -78,6 +78,8 @@ namespace mRemoteNG.UI.Controls.Base
             // Init 
             var g = e.Graphics;
             g.SmoothingMode = SmoothingMode.AntiAlias;
+            if (_themeManager.ActiveTheme == null)
+                return;
 
             var fore = _themeManager.ActiveTheme.ExtendedPalette.getColor("CheckBox_Text");
             var outline = _themeManager.ActiveTheme.ExtendedPalette.getColor("CheckBox_Border");

mRemoteV1/UI/Controls/Base/NGTextBox.cs

@@ -20,9 +20,12 @@ namespace mRemoteNG.UI.Controls.Base
             base.OnCreateControl(); 
             _themeManager = ThemeManager.getInstance();
             if (!_themeManager.ThemingActive) return;
-            ForeColor = _themeManager.ActiveTheme.ExtendedPalette.getColor("TextBox_Foreground");
-            BackColor = _themeManager.ActiveTheme.ExtendedPalette.getColor("TextBox_Background");
-            Invalidate();
+            if (_themeManager.ActiveTheme != null)
+            {
+                ForeColor = _themeManager.ActiveTheme.ExtendedPalette.getColor("TextBox_Foreground");
+                BackColor = _themeManager.ActiveTheme.ExtendedPalette.getColor("TextBox_Background");
+                Invalidate();
+            }
         }
          
 

mRemoteV1/UI/Controls/ConnectionTree/ConnectionTree.cs

@@ -1,16 +1,16 @@
-using System;
-using System.Collections.Generic;
-using System.Collections.Specialized;
-using System.ComponentModel;
-using System.Linq;
-using System.Windows.Forms;
-using BrightIdeasSoftware;
+using BrightIdeasSoftware;
 using mRemoteNG.App;
 using mRemoteNG.Config.Putty;
 using mRemoteNG.Connection;
 using mRemoteNG.Container;
 using mRemoteNG.Tree;
 using mRemoteNG.Tree.Root;
+using System;
+using System.Collections.Generic;
+using System.Collections.Specialized;
+using System.ComponentModel;
+using System.Linq;
+using System.Windows.Forms;
 // ReSharper disable ArrangeAccessorOwnerBody
 
 namespace mRemoteNG.UI.Controls
@@ -43,8 +43,12 @@ namespace mRemoteNG.UI.Controls
             get { return _connectionTreeModel; }
             set
             {
+                if (_connectionTreeModel == value)
+                    return;
+
+                UnregisterModelUpdateHandlers(_connectionTreeModel);
                 _connectionTreeModel = value;
-                PopulateTreeView();
+                PopulateTreeView(value);
             }
         }
 
@@ -156,28 +160,31 @@ namespace mRemoteNG.UI.Controls
 		                   padding;
 		}
 
-        private void PopulateTreeView()
+        private void PopulateTreeView(ConnectionTreeModel newModel)
         {
-            UnregisterModelUpdateHandlers();
-            SetObjects(ConnectionTreeModel.RootNodes);
-            RegisterModelUpdateHandlers();
-            NodeSearcher = new NodeSearcher(ConnectionTreeModel);
+            SetObjects(newModel.RootNodes);
+            RegisterModelUpdateHandlers(newModel);
+            NodeSearcher = new NodeSearcher(newModel);
             ExecutePostSetupActions();
 			AutoResizeColumn(Columns[0]);
 		}
 
-        private void RegisterModelUpdateHandlers()
+        private void RegisterModelUpdateHandlers(ConnectionTreeModel newModel)
         {
             _puttySessionsManager.PuttySessionsCollectionChanged += OnPuttySessionsCollectionChanged;
-            ConnectionTreeModel.CollectionChanged += HandleCollectionChanged;
-            ConnectionTreeModel.PropertyChanged += HandleCollectionPropertyChanged;
+            newModel.CollectionChanged += HandleCollectionChanged;
+            newModel.PropertyChanged += HandleCollectionPropertyChanged;
         }
 
-        private void UnregisterModelUpdateHandlers()
+        private void UnregisterModelUpdateHandlers(ConnectionTreeModel oldConnectionTreeModel)
         {
             _puttySessionsManager.PuttySessionsCollectionChanged -= OnPuttySessionsCollectionChanged;
-            ConnectionTreeModel.CollectionChanged -= HandleCollectionChanged;
-            ConnectionTreeModel.PropertyChanged -= HandleCollectionPropertyChanged;
+
+            if (oldConnectionTreeModel == null)
+                return;
+
+            oldConnectionTreeModel.CollectionChanged -= HandleCollectionChanged;
+            oldConnectionTreeModel.PropertyChanged -= HandleCollectionPropertyChanged;
         }
 
         private void OnPuttySessionsCollectionChanged(object sender, NotifyCollectionChangedEventArgs args)
@@ -220,14 +227,19 @@ namespace mRemoteNG.UI.Controls
             return (RootNodeInfo)ConnectionTreeModel.RootNodes.First(item => item is RootNodeInfo);
         }
 
+        public void Invoke(Action action)
+        {
+            Invoke((Delegate)action);
+        }
+
         public void InvokeExpand(object model)
         {
-            Invoke((MethodInvoker)(() => Expand(model)));
+            Invoke(() => Expand(model));
         }
 
         public void InvokeRebuildAll(bool preserveState)
         {
-            Invoke((MethodInvoker)(() => RebuildAll(preserveState)));
+            Invoke(() => RebuildAll(preserveState));
         }
 
         public IEnumerable<RootPuttySessionsNodeInfo> GetRootPuttyNodes()

mRemoteV1/UI/Controls/MultiSshToolStrip.cs

@@ -1,5 +1,6 @@
 using System.ComponentModel;
 using System.Windows.Forms;
+using mRemoteNG.Themes;
 using mRemoteNG.Tools;
 
 namespace mRemoteNG.UI.Controls
@@ -10,12 +11,16 @@ namespace mRemoteNG.UI.Controls
 		private ToolStripLabel _lblMultiSsh;
 		private ToolStripTextBox _txtMultiSsh;
 		private MultiSSHController _multiSshController;
+	    private ThemeManager _themeManager;
 
 
-		public MultiSshToolStrip()
+        public MultiSshToolStrip()
 		{
 			InitializeComponent();
-			_multiSshController = new MultiSSHController(_txtMultiSsh);
+		    _themeManager = ThemeManager.getInstance();
+		    _themeManager.ThemeChanged += ApplyTheme;
+		    ApplyTheme();
+            _multiSshController = new MultiSSHController(_txtMultiSsh);
 		}
 
 		private void InitializeComponent()
@@ -43,7 +48,14 @@ namespace mRemoteNG.UI.Controls
 			ResumeLayout(true);
 		}
 
-		protected override void Dispose(bool disposing)
+	    private void ApplyTheme()
+	    {
+	        if (!_themeManager.ThemingActive) return;
+	        _txtMultiSsh.BackColor = _themeManager.ActiveTheme.ExtendedPalette.getColor("TextBox_Background");
+	        _txtMultiSsh.ForeColor = _themeManager.ActiveTheme.ExtendedPalette.getColor("TextBox_Foreground");
+	    }
+
+        protected override void Dispose(bool disposing)
 		{
 			if (disposing)
 			{

mRemoteV1/UI/Forms/OptionsPages/CredentialsPage.Designer.cs

@@ -28,8 +28,8 @@
         /// </summary>
         private void InitializeComponent()
         {
-            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(CredentialsPage));
             this.pnlDefaultCredentials = new System.Windows.Forms.Panel();
+            this.chkUseAdmPwd = new mRemoteNG.UI.Controls.Base.NGCheckBox();
             this.radCredentialsCustom = new mRemoteNG.UI.Controls.Base.NGRadioButton();
             this.lblDefaultCredentials = new mRemoteNG.UI.Controls.Base.NGLabel();
             this.radCredentialsNoInfo = new mRemoteNG.UI.Controls.Base.NGRadioButton();
@@ -45,6 +45,7 @@
             // 
             // pnlDefaultCredentials
             // 
+            this.pnlDefaultCredentials.Controls.Add(this.chkUseAdmPwd);
             this.pnlDefaultCredentials.Controls.Add(this.radCredentialsCustom);
             this.pnlDefaultCredentials.Controls.Add(this.lblDefaultCredentials);
             this.pnlDefaultCredentials.Controls.Add(this.radCredentialsNoInfo);
@@ -57,18 +58,32 @@
             this.pnlDefaultCredentials.Controls.Add(this.lblCredentialsDomain);
             this.pnlDefaultCredentials.Location = new System.Drawing.Point(3, 3);
             this.pnlDefaultCredentials.Name = "pnlDefaultCredentials";
-            this.pnlDefaultCredentials.Size = new System.Drawing.Size(596, 175);
+            this.pnlDefaultCredentials.Size = new System.Drawing.Size(596, 210);
             this.pnlDefaultCredentials.TabIndex = 0;
             // 
+            // chkUseAdmPwd
+            // 
+            this.chkUseAdmPwd._mice = mRemoteNG.UI.Controls.Base.NGCheckBox.MouseState.OUT;
+            this.chkUseAdmPwd.AutoSize = true;
+            this.chkUseAdmPwd.Enabled = false;
+            this.chkUseAdmPwd.Location = new System.Drawing.Point(140, 149);
+            this.chkUseAdmPwd.Name = "chkUseAdmPwd";
+            this.chkUseAdmPwd.Size = new System.Drawing.Size(214, 17);
+            this.chkUseAdmPwd.TabIndex = 10;
+            this.chkUseAdmPwd.Text = "use AdmPwd.E to retrieve the password";
+            this.chkUseAdmPwd.UseVisualStyleBackColor = true;
+            this.chkUseAdmPwd.CheckedChanged += new System.EventHandler(this.chkUseAdmPwd_CheckedChanged);
+            // 
             // radCredentialsCustom
             // 
             this.radCredentialsCustom.AutoSize = true;
+            this.radCredentialsCustom.BackColor = System.Drawing.Color.Transparent;
             this.radCredentialsCustom.Location = new System.Drawing.Point(16, 69);
             this.radCredentialsCustom.Name = "radCredentialsCustom";
             this.radCredentialsCustom.Size = new System.Drawing.Size(87, 17);
             this.radCredentialsCustom.TabIndex = 3;
             this.radCredentialsCustom.Text = "the following:";
-            this.radCredentialsCustom.UseVisualStyleBackColor = true;
+            this.radCredentialsCustom.UseVisualStyleBackColor = false;
             this.radCredentialsCustom.CheckedChanged += new System.EventHandler(this.radCredentialsCustom_CheckedChanged);
             // 
             // lblDefaultCredentials
@@ -83,6 +98,7 @@
             // radCredentialsNoInfo
             // 
             this.radCredentialsNoInfo.AutoSize = true;
+            this.radCredentialsNoInfo.BackColor = System.Drawing.Color.Transparent;
             this.radCredentialsNoInfo.Checked = true;
             this.radCredentialsNoInfo.Location = new System.Drawing.Point(16, 31);
             this.radCredentialsNoInfo.Name = "radCredentialsNoInfo";
@@ -90,23 +106,24 @@
             this.radCredentialsNoInfo.TabIndex = 1;
             this.radCredentialsNoInfo.TabStop = true;
             this.radCredentialsNoInfo.Text = "no information";
-            this.radCredentialsNoInfo.UseVisualStyleBackColor = true;
+            this.radCredentialsNoInfo.UseVisualStyleBackColor = false;
             // 
             // radCredentialsWindows
             // 
             this.radCredentialsWindows.AutoSize = true;
+            this.radCredentialsWindows.BackColor = System.Drawing.Color.Transparent;
             this.radCredentialsWindows.Location = new System.Drawing.Point(16, 50);
             this.radCredentialsWindows.Name = "radCredentialsWindows";
             this.radCredentialsWindows.Size = new System.Drawing.Size(227, 17);
             this.radCredentialsWindows.TabIndex = 2;
             this.radCredentialsWindows.Text = "my current credentials (windows logon info)";
-            this.radCredentialsWindows.UseVisualStyleBackColor = true;
+            this.radCredentialsWindows.UseVisualStyleBackColor = false;
             // 
             // txtCredentialsDomain
             // 
             this.txtCredentialsDomain.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
             this.txtCredentialsDomain.Enabled = false;
-            this.txtCredentialsDomain.Location = new System.Drawing.Point(140, 147);
+            this.txtCredentialsDomain.Location = new System.Drawing.Point(140, 172);
             this.txtCredentialsDomain.Name = "txtCredentialsDomain";
             this.txtCredentialsDomain.Size = new System.Drawing.Size(150, 20);
             this.txtCredentialsDomain.TabIndex = 9;
@@ -153,7 +170,7 @@
             // lblCredentialsDomain
             // 
             this.lblCredentialsDomain.Enabled = false;
-            this.lblCredentialsDomain.Location = new System.Drawing.Point(34, 150);
+            this.lblCredentialsDomain.Location = new System.Drawing.Point(34, 175);
             this.lblCredentialsDomain.Name = "lblCredentialsDomain";
             this.lblCredentialsDomain.Size = new System.Drawing.Size(100, 13);
             this.lblCredentialsDomain.TabIndex = 8;
@@ -166,7 +183,6 @@
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.Controls.Add(this.pnlDefaultCredentials);
             this.Name = "CredentialsPage";
-            this.PageIcon = ((System.Drawing.Icon)(resources.GetObject("$this.PageIcon")));
             this.Size = new System.Drawing.Size(610, 489);
             this.pnlDefaultCredentials.ResumeLayout(false);
             this.pnlDefaultCredentials.PerformLayout();
@@ -186,5 +202,6 @@
         internal Controls.Base.NGLabel lblCredentialsPassword;
         internal Controls.Base.NGTextBox txtCredentialsUsername;
         internal Controls.Base.NGLabel lblCredentialsDomain;
+        private Controls.Base.NGCheckBox chkUseAdmPwd;
     }
 }