diff --git a/mRemoteNGTests/IntegrationTests/ConnectionInheritanceIntegrationTests.cs b/mRemoteNGTests/IntegrationTests/ConnectionInheritanceIntegrationTests.cs
index c5645473..ec9c865c 100644
--- a/mRemoteNGTests/IntegrationTests/ConnectionInheritanceIntegrationTests.cs
+++ b/mRemoteNGTests/IntegrationTests/ConnectionInheritanceIntegrationTests.cs
@@ -34,39 +34,39 @@ namespace mRemoteNGTests.IntegrationTests
              * ------Connection2
              * ----Connection3 (inherits username)
              */
-            var folder1 = new ContainerInfo {Username = "folder1User"};
-            var folder2 = new ContainerInfo {Username = "folder2User"};
+            var folder1 = new ContainerInfo { Icon = "someicon1" };
+            var folder2 = new ContainerInfo { Icon = "someicon2" };
             var connection1 = new ConnectionInfo();
             var connection2 = new ConnectionInfo();
-            var connection3 = new ConnectionInfo {Inheritance = {Username = true}};
+            var connection3 = new ConnectionInfo {Inheritance = {Icon = true}};
             _rootNode.AddChild(folder1);
             folder1.AddChildRange(new []{connection1, folder2, connection3});
             folder2.AddChild(connection2);
-            Assert.That(connection3.Username, Is.EqualTo(folder1.Username));
+            Assert.That(connection3.Icon, Is.EqualTo(folder1.Icon));
         }
 
         [Test]
         public void ConnectionWillInheritAllFromFolder()
         {
-            var folder = new ContainerInfo() {Protocol = ProtocolType.SSH2, Username = "folderUser", Domain = "CoolDomain"};
-            var connection = new ConnectionInfo() {Inheritance = {EverythingInherited = true}};
+            var folder = new ContainerInfo {Protocol = ProtocolType.SSH2, Icon = "someicon", CacheBitmaps = true};
+            var connection = new ConnectionInfo {Inheritance = {EverythingInherited = true}};
             _rootNode.AddChild(folder);
             folder.AddChild(connection);
-            Assert.That(new object[] { connection.Protocol, connection.Username, connection.Domain }, Is.EquivalentTo(new object[] {folder.Protocol, folder.Username, folder.Domain}));
+            Assert.That(new object[] { connection.Protocol, connection.Icon, connection.CacheBitmaps }, Is.EquivalentTo(new object[] {folder.Protocol, folder.Icon, folder.CacheBitmaps }));
         }
 
         [Test]
         public void CanInheritThroughMultipleFolderLevels()
         {
-            var folder1 = new ContainerInfo {Username = "folder1User"};
-            var folder2 = new ContainerInfo {Inheritance = {Username = true}};
-            var folder3 = new ContainerInfo {Inheritance = {Username = true}};
-            var connection = new ConnectionInfo {Inheritance = {Username = true}};
+            var folder1 = new ContainerInfo { Icon = "someicon"};
+            var folder2 = new ContainerInfo {Inheritance = { Icon = true}};
+            var folder3 = new ContainerInfo {Inheritance = { Icon = true}};
+            var connection = new ConnectionInfo {Inheritance = { Icon = true}};
             _rootNode.AddChild(folder1);
             folder1.AddChild(folder2);
             folder2.AddChild(folder3);
             folder3.AddChild(connection);
-            Assert.That(connection.Username, Is.EqualTo(folder1.Username));
+            Assert.That(connection.Icon, Is.EqualTo(folder1.Icon));
         }
     }
 }
\ No newline at end of file
diff --git a/mRemoteV1/Config/Serializers/XmlConnectionNodeSerializer.cs b/mRemoteV1/Config/Serializers/XmlConnectionNodeSerializer.cs
index 47105353..0da6517a 100644
--- a/mRemoteV1/Config/Serializers/XmlConnectionNodeSerializer.cs
+++ b/mRemoteV1/Config/Serializers/XmlConnectionNodeSerializer.cs
@@ -47,15 +47,15 @@ namespace mRemoteNG.Config.Serializers
             element.Add(new XAttribute("Id", connectionInfo.ConstantID));
 
             element.Add(_saveFilter.SaveUsername
-                ? new XAttribute("Username", connectionInfo.Username)
+                ? new XAttribute("Username", connectionInfo.Username ?? "")
                 : new XAttribute("Username", ""));
 
             element.Add(_saveFilter.SaveDomain
-                ? new XAttribute("Domain", connectionInfo.Domain)
+                ? new XAttribute("Domain", connectionInfo.Domain ?? "")
                 : new XAttribute("Domain", ""));
 
             if (_saveFilter.SavePassword && !connectionInfo.Inheritance.Password)
-                element.Add(new XAttribute("Password", _cryptographyProvider.Encrypt(connectionInfo.Password, _encryptionKey)));
+                element.Add(new XAttribute("Password", _cryptographyProvider.Encrypt(connectionInfo.Password, _encryptionKey) ?? ""));
             else
                 element.Add(new XAttribute("Password", ""));