diff --git a/mRemoteNG/Documentation/mssql_db_setup.sql b/mRemoteNG/Documentation/mssql_db_setup.sql
index 04085234a..73f93b5eb 100644
--- a/mRemoteNG/Documentation/mssql_db_setup.sql
+++ b/mRemoteNG/Documentation/mssql_db_setup.sql
@@ -28,6 +28,8 @@ CREATE TABLE [dbo].[tblCons] (
 	Username varchar(512),
 	DomainName varchar(512),
 	Password varchar(1024),
+    SSHTunnelConnectionName varchar(128) NOT NULL,
+    SSHOptions varchar(1024) NOT NULL,
 	Hostname varchar(512),
 	Protocol varchar(32) NOT NULL,
 	PuttySession varchar(128),
@@ -45,17 +47,15 @@ CREATE TABLE [dbo].[tblCons] (
 	DisplayThemes bit NOT NULL,
 	EnableFontSmoothing bit NOT NULL,
 	EnableDesktopComposition bit NOT NULL,
-
-
 	DisableFullWindowDrag bit NOT NULL,
 	DisableMenuAnimations bit NOT NULL,
 	DisableCursorShadow bit NOT NULL,
 	DisableCursorBlinking bit NOT NULL,
-
 	CacheBitmaps bit NOT NULL,
 	RedirectDiskDrives bit NOT NULL,
 	RedirectPorts bit NOT NULL,
 	RedirectPrinters bit NOT NULL,
+	RedirectClipboard bit NOT NULL,
 	RedirectSmartCards bit NOT NULL,
 	RedirectSound varchar(64) NOT NULL,
 	SoundQuality varchar(20) NOT NULL,
@@ -67,6 +67,7 @@ CREATE TABLE [dbo].[tblCons] (
 	MacAddress varchar(32),
 	UserField varchar(256),
 	ExtApp varchar(256),
+    Favorite tinyint(1) NOT NULL,
 	VNCCompression varchar(10),
 	VNCEncoding varchar(20),
 	VNCAuthMode varchar(10),
@@ -84,6 +85,13 @@ CREATE TABLE [dbo].[tblCons] (
 	RDGatewayUsername varchar(512),
 	RDGatewayPassword varchar(1024),
 	RDGatewayDomain varchar(512),
+	LoadBalanceInfo varchar(1024),
+	AutomaticResize bit DEFAULT ((1)) NOT NULL,
+	RedirectClipboard bit DEFAULT ((0)) NOT NULL,
+	RdpVersion varchar(10),
+	VmId varchar(100),
+	UseVmId bit,
+	UseEnhancedMode bit DEFAULT ((0)),
 	InheritCacheBitmaps bit NOT NULL,
 	InheritColors bit NOT NULL,
 	InheritDescription bit NOT NULL,
@@ -97,6 +105,8 @@ CREATE TABLE [dbo].[tblCons] (
 	InheritPassword bit NOT NULL,
 	InheritPort bit NOT NULL,
 	InheritProtocol bit NOT NULL,
+    InheritSSHTunnelConnectionName bit NOT NULL,
+    InheritSSHOptions bit NOT NULL,
 	InheritPuttySession bit NOT NULL,
 	InheritRedirectDiskDrives bit NOT NULL,
 	InheritRedirectKeys bit NOT NULL,
@@ -118,6 +128,7 @@ CREATE TABLE [dbo].[tblCons] (
 	InheritPreExtApp bit NOT NULL,
 	InheritPostExtApp bit NOT NULL,
 	InheritMacAddress bit NOT NULL,
+    InheritFavorite bit NOT NULL,
 	InheritUserField bit NOT NULL,
 	InheritExtApp bit NOT NULL,
 	InheritVNCCompression bit NOT NULL,
@@ -137,17 +148,10 @@ CREATE TABLE [dbo].[tblCons] (
 	InheritRDGatewayUsername bit NOT NULL,
 	InheritRDGatewayPassword bit NOT NULL,
 	InheritRDGatewayDomain bit NOT NULL,
-	LoadBalanceInfo varchar(1024),
-	AutomaticResize bit DEFAULT ((1)) NOT NULL,
 	InheritLoadBalanceInfo bit DEFAULT ((0)) NOT NULL,
 	InheritAutomaticResize bit DEFAULT ((0)) NOT NULL,
-	RedirectClipboard bit DEFAULT ((0)) NOT NULL,
 	InheritRedirectClipboard bit DEFAULT ((0)) NOT NULL,
-	RdpVersion varchar(10),
 	InheritRdpVersion bit DEFAULT ((0)) NOT NULL,
-	VmId varchar(100),
-	UseVmId bit,
-	UseEnhancedMode bit DEFAULT ((0)),
 	InheritVmId bit ,
 	InheritUseVmId bit,
 	InheritUseEnhancedMode bit DEFAULT ((0))
diff --git a/mRemoteNG/Documentation/mysql_db_setup.sql b/mRemoteNG/Documentation/mysql_db_setup.sql
index 7cbe55a50..f4543ccb7 100644
--- a/mRemoteNG/Documentation/mysql_db_setup.sql
+++ b/mRemoteNG/Documentation/mysql_db_setup.sql
@@ -58,6 +58,7 @@ CREATE TABLE `tblCons` (
     `RedirectDiskDrives` tinyint(1) NOT NULL,
     `RedirectPorts` tinyint(1) NOT NULL,
     `RedirectPrinters` tinyint(1) NOT NULL,
+    `RedirectClipboard` tinyint(1) NOT NULL,
     `RedirectSmartCards` tinyint(1) NOT NULL,
     `RedirectSound` varchar(64) NOT NULL,  
     `SoundQuality` varchar(20) NOT NULL,
@@ -69,6 +70,7 @@ CREATE TABLE `tblCons` (
     `MacAddress` varchar(32) DEFAULT NULL,
     `UserField` varchar(256) DEFAULT NULL,
     `ExtApp` varchar(256) DEFAULT NULL,
+    `Favorite`  tinyint(1) NOT NULL,
     `VNCCompression` varchar(10) DEFAULT NULL,
     `VNCEncoding` varchar(20) DEFAULT NULL,
     `VNCAuthMode` varchar(10) DEFAULT NULL,
@@ -86,6 +88,13 @@ CREATE TABLE `tblCons` (
     `RDGatewayUsername` varchar(512) DEFAULT NULL,
     `RDGatewayPassword` varchar(1024) DEFAULT NULL,
     `RDGatewayDomain` varchar(512) DEFAULT NULL,
+    `LoadBalanceInfo` varchar(1024) DEFAULT NULL,
+    `AutomaticResize` tinyint(1) NOT NULL DEFAULT 1,
+    `RedirectClipboard` tinyint(1) NOT NULL DEFAULT 0,
+    `RdpVersion` varchar(10) DEFAULT NULL,
+	`VmId` varchar(512) DEFAULT NULL,
+	`UseVmId` tinyint(1) DEFAULT NULL,
+	`UseEnhancedMode` tinyint(1) DEFAULT NULL,
     `InheritCacheBitmaps` tinyint(1) NOT NULL,
     `InheritColors` tinyint(1) NOT NULL,
     `InheritDescription` tinyint(1) NOT NULL,
@@ -122,6 +131,7 @@ CREATE TABLE `tblCons` (
     `InheritPreExtApp` tinyint(1) NOT NULL,
     `InheritPostExtApp` tinyint(1) NOT NULL,
     `InheritMacAddress` tinyint(1) NOT NULL,
+    `InheritFavorite` tinyint(1) NOT NULL,
     `InheritUserField` tinyint(1) NOT NULL,
     `InheritExtApp` tinyint(1) NOT NULL,
     `InheritVNCCompression` tinyint(1) NOT NULL,
@@ -141,17 +151,10 @@ CREATE TABLE `tblCons` (
     `InheritRDGatewayUsername` tinyint(1) NOT NULL,
     `InheritRDGatewayPassword` tinyint(1) NOT NULL,
     `InheritRDGatewayDomain` tinyint(1) NOT NULL,
-    `LoadBalanceInfo` varchar(1024) DEFAULT NULL,
-    `AutomaticResize` tinyint(1) NOT NULL DEFAULT 1,
     `InheritLoadBalanceInfo` tinyint(1) NOT NULL DEFAULT 0,
     `InheritAutomaticResize` tinyint(1) NOT NULL DEFAULT 0,
-    `RedirectClipboard` tinyint(1) NOT NULL DEFAULT 0,
     `InheritRedirectClipboard` tinyint(1) NOT NULL DEFAULT 0,
-    `RdpVersion` varchar(10) DEFAULT NULL,
     `InheritRdpVersion` tinyint(1) NOT NULL DEFAULT 0,
-	`VmId` varchar(512) DEFAULT NULL,
-	`UseVmId` tinyint(1) DEFAULT NULL,
-	`UseEnhancedMode` tinyint(1) DEFAULT NULL,
 	`InheritVmId` tinyint(1) DEFAULT NULL,
 	`InheritUseVmId` tinyint(1) DEFAULT NULL,
 	`InheritUseEnhancedMode` tinyint(1) DEFAULT NULL,