diff --git a/mRemoteNGTests/UI/Window/ConfigWindowTests/ConfigWindowGeneralTests.cs b/mRemoteNGTests/UI/Window/ConfigWindowTests/ConfigWindowGeneralTests.cs
index 9dbbbffcd..964232d8e 100644
--- a/mRemoteNGTests/UI/Window/ConfigWindowTests/ConfigWindowGeneralTests.cs
+++ b/mRemoteNGTests/UI/Window/ConfigWindowTests/ConfigWindowGeneralTests.cs
@@ -267,6 +267,7 @@ namespace mRemoteNGTests.UI.Window.ConfigWindowTests
                         nameof(ConnectionInfo.Password),
                         nameof(ConnectionInfo.Domain),
                         nameof(ConnectionInfo.Port),
+                        nameof(ConnectionInfo.SSHTunnelConnectionName),
                         nameof(ConnectionInfo.UseVmId),
                         nameof(ConnectionInfo.UseConsoleSession),
                         nameof(ConnectionInfo.RDPAuthenticationLevel),
@@ -297,6 +298,7 @@ namespace mRemoteNGTests.UI.Window.ConfigWindowTests
                     {
                         nameof(ConnectionInfo.Password),
                         nameof(ConnectionInfo.Port),
+                        nameof(ConnectionInfo.SSHTunnelConnectionName),
                         nameof(ConnectionInfo.VNCSmartSizeMode),
                         nameof(ConnectionInfo.VNCViewOnly),
                     });
@@ -308,6 +310,8 @@ namespace mRemoteNGTests.UI.Window.ConfigWindowTests
                         nameof(ConnectionInfo.Username),
                         nameof(ConnectionInfo.Password),
                         nameof(ConnectionInfo.Port),
+                        nameof(ConnectionInfo.SSHOptions),
+                        nameof(ConnectionInfo.SSHTunnelConnectionName),
                         nameof(ConnectionInfo.PuttySession)
                     });
                     break;
@@ -317,6 +321,7 @@ namespace mRemoteNGTests.UI.Window.ConfigWindowTests
                     expectedProperties.AddRange(new[]
                     {
                         nameof(ConnectionInfo.Port),
+                        nameof(ConnectionInfo.SSHTunnelConnectionName),
                         nameof(ConnectionInfo.PuttySession),
                     });
                     break;
@@ -327,6 +332,7 @@ namespace mRemoteNGTests.UI.Window.ConfigWindowTests
                         nameof(ConnectionInfo.Username),
                         nameof(ConnectionInfo.Password),
                         nameof(ConnectionInfo.Port),
+                        nameof(ConnectionInfo.SSHTunnelConnectionName),
                         nameof(ConnectionInfo.RenderingEngine),
                     });
                     break;
@@ -336,6 +342,7 @@ namespace mRemoteNGTests.UI.Window.ConfigWindowTests
                         nameof(ConnectionInfo.Username),
                         nameof(ConnectionInfo.Password),
                         nameof(ConnectionInfo.Domain),
+                        nameof(ConnectionInfo.SSHTunnelConnectionName),
                         nameof(ConnectionInfo.ICAEncryptionStrength),
                         nameof(ConnectionInfo.Resolution),
                         nameof(ConnectionInfo.Colors),
@@ -349,6 +356,7 @@ namespace mRemoteNGTests.UI.Window.ConfigWindowTests
                         nameof(ConnectionInfo.Password),
                         nameof(ConnectionInfo.Domain),
                         nameof(ConnectionInfo.Port),
+                        nameof(ConnectionInfo.SSHTunnelConnectionName),
                         nameof(ConnectionInfo.ExtApp),
                     });
                     break;
diff --git a/mRemoteV1/Config/Serializers/ConnectionSerializers/Xml/XmlConnectionsDeserializer.cs b/mRemoteV1/Config/Serializers/ConnectionSerializers/Xml/XmlConnectionsDeserializer.cs
index 80956c4d7..dcd6ffa5c 100644
--- a/mRemoteV1/Config/Serializers/ConnectionSerializers/Xml/XmlConnectionsDeserializer.cs
+++ b/mRemoteV1/Config/Serializers/ConnectionSerializers/Xml/XmlConnectionsDeserializer.cs
@@ -533,11 +533,7 @@ namespace mRemoteNG.Config.Serializers.Xml
                         xmlnode.GetAttributeAsBool("InheritRDPMinutesToIdleTimeout");
                     connectionInfo.RDPAlertIdleTimeout = xmlnode.GetAttributeAsBool("RDPAlertIdleTimeout");
                     connectionInfo.Inheritance.RDPAlertIdleTimeout =
-                        xmlnode.GetAttributeAsBool("InheritRDPAlertIdleTimeout");
-                    connectionInfo.SSHTunnelConnectionName = xmlnode.GetAttributeAsString("SSHTunnelConnectionName");
-                    connectionInfo.Inheritance.SSHTunnelConnectionName = xmlnode.GetAttributeAsBool("InheritSSHTunnelConnectionName");
-                    connectionInfo.SSHOptions = xmlnode.GetAttributeAsString("SSHOptions");
-                    connectionInfo.Inheritance.SSHOptions = xmlnode.GetAttributeAsBool("InheritSSHOptions");                }
+                        xmlnode.GetAttributeAsBool("InheritRDPAlertIdleTimeout");          }
 
                 if (_confVersion >= 2.7)
                 {
@@ -546,13 +542,17 @@ namespace mRemoteNG.Config.Serializers.Xml
                     connectionInfo.UseVmId = xmlnode.GetAttributeAsBool("UseVmId");
                     connectionInfo.VmId = xmlnode.GetAttributeAsString("VmId");
                     connectionInfo.UseEnhancedMode = xmlnode.GetAttributeAsBool("UseEnhancedMode");
+                    connectionInfo.RdpVersion = xmlnode.GetAttributeAsEnum("RdpVersion", RdpVersion.Highest);
+                    connectionInfo.SSHTunnelConnectionName = xmlnode.GetAttributeAsString("SSHTunnelConnectionName");
+                    connectionInfo.SSHOptions = xmlnode.GetAttributeAsString("SSHOptions");
                     connectionInfo.Inheritance.RedirectClipboard = xmlnode.GetAttributeAsBool("InheritRedirectClipboard");
                     connectionInfo.Inheritance.Favorite = xmlnode.GetAttributeAsBool("InheritFavorite");
-                    connectionInfo.RdpVersion = xmlnode.GetAttributeAsEnum("RdpVersion", RdpVersion.Highest);
                     connectionInfo.Inheritance.RdpVersion = xmlnode.GetAttributeAsBool("InheritRdpVersion");
                     connectionInfo.Inheritance.UseVmId = xmlnode.GetAttributeAsBool("InheritUseVmId");
                     connectionInfo.Inheritance.VmId = xmlnode.GetAttributeAsBool("InheritVmId");
                     connectionInfo.Inheritance.UseEnhancedMode = xmlnode.GetAttributeAsBool("InheritUseEnhancedMode");
+                    connectionInfo.Inheritance.SSHTunnelConnectionName = xmlnode.GetAttributeAsBool("InheritSSHTunnelConnectionName");
+                    connectionInfo.Inheritance.SSHOptions = xmlnode.GetAttributeAsBool("InheritSSHOptions");
                 }
             }
             catch (Exception ex)
diff --git a/mRemoteV1/Connection/ConnectionInfoInheritance.cs b/mRemoteV1/Connection/ConnectionInfoInheritance.cs
index 783f64d83..f78bdf4e3 100644
--- a/mRemoteV1/Connection/ConnectionInfoInheritance.cs
+++ b/mRemoteV1/Connection/ConnectionInfoInheritance.cs
@@ -114,8 +114,8 @@ namespace mRemoteNG.Connection
         public bool Port { get; set; }
 
         [LocalizedAttributes.LocalizedCategory("strCategoryProtocol", 4),
-         LocalizedAttributes.LocalizedDisplayNameInheritAttribute("strPropertyNameSSHOptions"),
-         LocalizedAttributes.LocalizedDescriptionInheritAttribute("strPropertyDescriptionSSHOptions"),
+         LocalizedAttributes.LocalizedDisplayNameInherit("strPropertyNameSSHOptions"),
+         LocalizedAttributes.LocalizedDescriptionInherit("strPropertyDescriptionSSHOptions"),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool SSHOptions { get; set; }
 
diff --git a/mRemoteV1/Schemas/mremoteng_confcons_v2_6.xsd b/mRemoteV1/Schemas/mremoteng_confcons_v2_6.xsd
index c640a3836..f472fec32 100644
--- a/mRemoteV1/Schemas/mremoteng_confcons_v2_6.xsd
+++ b/mRemoteV1/Schemas/mremoteng_confcons_v2_6.xsd
@@ -41,8 +41,6 @@
         <xs:attribute name="Password" type="xs:string" use="required" />
         <xs:attribute name="Hostname" type="xs:string" use="required" />
         <xs:attribute name="Protocol" type="xs:string" use="required" />
-        <xs:attribute name="SSHTunnelConnectionName" type="xs:string" use="optional" />
-        <xs:attribute name="SSHOptions" type="xs:string" use="optional" />
         <xs:attribute name="PuttySession" type="xs:string" use="required" />
         <xs:attribute name="Port" type="xs:int" use="required" />
         <xs:attribute name="ConnectToConsole" type="xs:boolean" use="required" />
@@ -104,8 +102,6 @@
         <xs:attribute name="InheritPassword" type="xs:boolean" use="optional" />
         <xs:attribute name="InheritPort" type="xs:boolean" use="optional" />
         <xs:attribute name="InheritProtocol" type="xs:boolean" use="optional" />
-        <xs:attribute name="InheritSSHTunnelConnectionName" type="xs:boolean" use="optional" />
-        <xs:attribute name="InheritSSHOptions" type="xs:boolean" use="optional" />
         <xs:attribute name="InheritPuttySession" type="xs:boolean" use="optional" />
         <xs:attribute name="InheritRedirectDiskDrives" type="xs:boolean" use="optional" />
         <xs:attribute name="InheritRedirectKeys" type="xs:boolean" use="optional" />
diff --git a/mRemoteV1/Schemas/mremoteng_confcons_v2_7.xsd b/mRemoteV1/Schemas/mremoteng_confcons_v2_7.xsd
index 3ca147fd1..0ae071941 100644
--- a/mRemoteV1/Schemas/mremoteng_confcons_v2_7.xsd
+++ b/mRemoteV1/Schemas/mremoteng_confcons_v2_7.xsd
@@ -36,12 +36,9 @@
         <xs:attribute name="Descr" type="xs:string" use="required" />
         <xs:attribute name="Icon" type="xs:string" use="required" />
         <xs:attribute name="Panel" type="xs:string" use="required" />
-
-        <!--<xs:attribute name="CredentialId" type="xs:string" use="required" />-->
         <xs:attribute name="Username" type="xs:string" use="required" />
         <xs:attribute name="Domain" type="xs:string" use="required" />
         <xs:attribute name="Password" type="xs:string" use="required" />
-
         <xs:attribute name="Hostname" type="xs:string" use="required" />
         <xs:attribute name="Protocol" type="xs:string" use="required" />
         <xs:attribute name="RdpVersion" type="xs:string" use="required" />