diff --git a/mRemoteV1/Config/Config.Connections.Load.vb b/mRemoteV1/Config/Config.Connections.Load.vb
index 3d614d2dd..bbaa0597a 100644
--- a/mRemoteV1/Config/Config.Connections.Load.vb
+++ b/mRemoteV1/Config/Config.Connections.Load.vb
@@ -536,6 +536,20 @@ Namespace Config
                             conI.Inherit.ExtApp = .Item("InheritExtApp")
                         End If
 
+                        If Me.confVersion >= 2.2 Then
+                            conI.RDGatewayUsageMethod = Tools.Misc.StringToEnum(GetType(mRemote.Connection.Protocol.RDP.RDGatewayUsageMethod), .Item("RDGatewayUsageMethod"))
+                            conI.RDGatewayHostname = .Item("RDGatewayHostname")
+                            conI.RDGatewayUseConnectionCredentials = Tools.Misc.StringToEnum(GetType(mRemote.Connection.Protocol.RDP.RDGatewayUseConnectionCredentials), .Item("RDGatewayUseConnectionCredentials"))
+                            conI.RDGatewayUsername = .Item("RDGatewayUsername")
+                            conI.RDGatewayPassword = Security.Crypt.Decrypt(.Item("RDGatewayPassword"), pW)
+                            conI.RDGatewayDomain = .Item("RDGatewayDomain")
+                            conI.Inherit.RDGatewayUsageMethod = .Item("InheritRDGatewayUsageMethod")
+                            conI.Inherit.RDGatewayHostname = .Item("InheritRDGatewayHostname")
+                            conI.Inherit.RDGatewayUsername = .Item("InheritRDGatewayUsername")
+                            conI.Inherit.RDGatewayPassword = .Item("InheritRDGatewayPassword")
+                            conI.Inherit.RDGatewayDomain = .Item("InheritRDGatewayDomain")
+                        End If
+
                         If SQLUpdate = True Then
                             conI.PleaseConnect = .Item("Connected")
                         End If
diff --git a/mRemoteV1/Config/Config.Connections.Save.vb b/mRemoteV1/Config/Config.Connections.Save.vb
index ff661115d..64a676e3f 100644
--- a/mRemoteV1/Config/Config.Connections.Save.vb
+++ b/mRemoteV1/Config/Config.Connections.Save.vb
@@ -227,7 +227,9 @@ Namespace Config
                                                "RedirectPrinters, RedirectSmartCards, RedirectSound, RedirectKeys, " & _
                                                "Connected, PreExtApp, PostExtApp, MacAddress, UserField, ExtApp, VNCCompression, VNCEncoding, VNCAuthMode, " & _
                                                "VNCProxyType, VNCProxyIP, VNCProxyPort, VNCProxyUsername, VNCProxyPassword, " & _
-                                               "VNCColors, VNCSmartSizeMode, VNCViewOnly, InheritCacheBitmaps, InheritColors, " & _
+                                               "VNCColors, VNCSmartSizeMode, VNCViewOnly, " & _
+                                               "RDGatewayUsageMethod, RDGatewayHostname, RDGatewayUseConnectionCredentials, RDGatewayUsername, RDGatewayPassword, RDGatewayDomain, " & _
+                                               "InheritCacheBitmaps, InheritColors, " & _
                                                "InheritDescription, InheritDisplayThemes, InheritDisplayWallpaper, InheritDomain, " & _
                                                "InheritIcon, InheritPanel, InheritPassword, InheritPort, " & _
                                                "InheritProtocol, InheritPuttySession, InheritRedirectDiskDrives, " & _
@@ -238,6 +240,7 @@ Namespace Config
                                                "InheritVNCAuthMode, InheritVNCProxyType, InheritVNCProxyIP, InheritVNCProxyPort, " & _
                                                "InheritVNCProxyUsername, InheritVNCProxyPassword, InheritVNCColors, " & _
                                                "InheritVNCSmartSizeMode, InheritVNCViewOnly, " & _
+                                               "InheritRDGatewayUsageMethod, InheritRDGatewayHostname, InheritRDGatewayUseConnectionCredentials, InheritRDGatewayUsername, InheritRDGatewayPassword, InheritRDGatewayDomain, " & _
                                                "PositionID, ParentID, ConstantID, LastChange)" & _
                                                "VALUES (", sqlCon)
 
@@ -340,6 +343,28 @@ Namespace Config
                     sqlQuery.CommandText &= "'" & .VNCSmartSizeMode.ToString & "',"
                     sqlQuery.CommandText &= "'" & .VNCViewOnly & "',"
 
+                    sqlQuery.CommandText &= "'" & .RDGatewayUsageMethod.ToString & "',"
+                    sqlQuery.CommandText &= "'" & .RDGatewayHostname & "',"
+                    sqlQuery.CommandText &= "'" & .RDGatewayUseConnectionCredentials.ToString & "',"
+
+                    If Me._SaveSecurity.Username = True Then
+                        sqlQuery.CommandText &= "'" & .RDGatewayUsername & "',"
+                    Else
+                        sqlQuery.CommandText &= "'" & "" & "',"
+                    End If
+
+                    If Me._SaveSecurity.Password = True Then
+                        sqlQuery.CommandText &= "'" & .RDGatewayPassword & "',"
+                    Else
+                        sqlQuery.CommandText &= "'" & "" & "',"
+                    End If
+
+                    If Me._SaveSecurity.Domain = True Then
+                        sqlQuery.CommandText &= "'" & .RDGatewayDomain & "',"
+                    Else
+                        sqlQuery.CommandText &= "'" & "" & "',"
+                    End If
+
                     With .Inherit
                         If Me._SaveSecurity.Inheritance = True Then
                             sqlQuery.CommandText &= "'" & .CacheBitmaps & "',"
@@ -383,6 +408,13 @@ Namespace Config
                             sqlQuery.CommandText &= "'" & .VNCColors & "',"
                             sqlQuery.CommandText &= "'" & .VNCSmartSizeMode & "',"
                             sqlQuery.CommandText &= "'" & .VNCViewOnly & "',"
+
+                            sqlQuery.CommandText &= "'" & .RDGatewayUsageMethod & "',"
+                            sqlQuery.CommandText &= "'" & .RDGatewayHostname & "',"
+                            sqlQuery.CommandText &= "'" & .RDGatewayUseConnectionCredentials & "',"
+                            sqlQuery.CommandText &= "'" & .RDGatewayUsername & "',"
+                            sqlQuery.CommandText &= "'" & .RDGatewayPassword & "',"
+                            sqlQuery.CommandText &= "'" & .RDGatewayDomain & "',"
                         Else
                             sqlQuery.CommandText &= "'" & False & "',"
                             sqlQuery.CommandText &= "'" & False & "',"
@@ -425,6 +457,13 @@ Namespace Config
                             sqlQuery.CommandText &= "'" & False & "',"
                             sqlQuery.CommandText &= "'" & False & "',"
                             sqlQuery.CommandText &= "'" & False & "',"
+
+                            sqlQuery.CommandText &= "'" & False & "'," ' .RDGatewayUsageMethod
+                            sqlQuery.CommandText &= "'" & False & "'," ' .RDGatewayHostname
+                            sqlQuery.CommandText &= "'" & False & "'," ' .RDGatewayUseConnectionCredentials
+                            sqlQuery.CommandText &= "'" & False & "'," ' .RDGatewayUsername
+                            sqlQuery.CommandText &= "'" & False & "'," ' .RDGatewayPassword
+                            sqlQuery.CommandText &= "'" & False & "'," ' .RDGatewayDomain
                         End If
                     End With
 
@@ -704,7 +743,7 @@ Namespace Config
                         xW.WriteAttributeString("InheritVNCViewOnly", "", curConI.Inherit.VNCViewOnly)
                         xW.WriteAttributeString("InheritRDGatewayUsageMethod", "", curConI.Inherit.RDGatewayUsageMethod)
                         xW.WriteAttributeString("InheritRDGatewayHostname", "", curConI.Inherit.RDGatewayHostname)
-                        xW.WriteAttributeString("InheritRDGatewayUseConnectionCredentials", "", curConI.Inherit.RDGatewayUsername)
+                        xW.WriteAttributeString("InheritRDGatewayUseConnectionCredentials", "", curConI.Inherit.RDGatewayUseConnectionCredentials)
                         xW.WriteAttributeString("InheritRDGatewayUsername", "", curConI.Inherit.RDGatewayUsername)
                         xW.WriteAttributeString("InheritRDGatewayPassword", "", curConI.Inherit.RDGatewayPassword)
                         xW.WriteAttributeString("InheritRDGatewayDomain", "", curConI.Inherit.RDGatewayDomain)
@@ -761,8 +800,9 @@ Namespace Config
             End Sub
 #End Region
 
-            Private csvWr As StreamWriter
 #Region "CSV"
+            Private csvWr As StreamWriter
+
             Private Sub SaveTomRCSV()
                 If App.Runtime.ConnectionsFileLoaded = False Then
                     Exit Sub
diff --git a/mRemoteV1/Help/SQLScript.txt b/mRemoteV1/Help/SQLScript.txt
index 38eaf2504..fbb1fc89e 100644
--- a/mRemoteV1/Help/SQLScript.txt
+++ b/mRemoteV1/Help/SQLScript.txt
@@ -61,6 +61,12 @@ CREATE TABLE [dbo].[tblCons] (
 	[VNCColors] [varchar] (10) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
 	[VNCSmartSizeMode] [varchar] (20) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
 	[VNCViewOnly] [bit] NOT NULL ,
+	[RDGatewayUsageMethod] [varchar] (32) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL ,
+	[RDGatewayHostname] [varchar] (512) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
+	[RDGatewayUseConnectionCredentials] [varchar] (32) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL ,
+	[RDGatewayUsername] [varchar] (512) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
+	[RDGatewayPassword] [varchar] (1024) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
+	[RDGatewayDomain] [varchar] (512) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
 	[InheritCacheBitmaps] [bit] NOT NULL ,
 	[InheritColors] [bit] NOT NULL ,
 	[InheritDescription] [bit] NOT NULL ,
@@ -100,7 +106,13 @@ CREATE TABLE [dbo].[tblCons] (
 	[InheritVNCProxyPassword] [bit] NOT NULL ,
 	[InheritVNCColors] [bit] NOT NULL ,
 	[InheritVNCSmartSizeMode] [bit] NOT NULL ,
-	[InheritVNCViewOnly] [bit] NOT NULL
+	[InheritVNCViewOnly] [bit] NOT NULL ,
+	[InheritRDGatewayUsageMethod] [bit] NOT NULL ,
+	[InheritRDGatewayHostname] [bit] NOT NULL ,
+	[InheritRDGatewayUseConnectionCredentials] [bit] NOT NULL ,
+	[InheritRDGatewayUsername] [bit] NOT NULL ,
+	[InheritRDGatewayPassword] [bit] NOT NULL ,
+	[InheritRDGatewayDomain] [bit] NOT NULL
 ) ON [PRIMARY]
 GO