diff --git a/mRemoteNG/Config/Serializers/Versioning/SqlVersion26To27Upgrader.cs b/mRemoteNG/Config/Serializers/Versioning/SqlVersion26To27Upgrader.cs
index 9d078b93..4d7a4efa 100644
--- a/mRemoteNG/Config/Serializers/Versioning/SqlVersion26To27Upgrader.cs
+++ b/mRemoteNG/Config/Serializers/Versioning/SqlVersion26To27Upgrader.cs
@@ -25,18 +25,18 @@ namespace mRemoteNG.Config.Serializers.Versioning
                                                 "Upgrading database from version 2.6 to version 2.7.");
             const string sqlText = @"
 ALTER TABLE tblCons
-ADD RedirectClipboard bit NOT NULL DEFAULT 0,
-	InheritRedirectClipboard bit NOT NULL DEFAULT 0,
-    VmId varchar NOT NULL DEFAULT '',
-    UseVmId bit NOT NULL DEFAULT 0,
-    UseEnhancedMode bit NOT NULL DEFAULT 0,
-    InheritVmId bit NOT NULL DEFAULT 0,
-    InheritUseVmId bit NOT NULL DEFAULT 0,
-    SSHTunnelConnectionName varchar NOT NULL DEFAULT '',
-    InheritSSHTunnelConnectionName bit NOT NULL DEFAULT 0,
-    SSHOptions varchar NOT NULL DEFAULT '',
-    InheritSSHOptions bit NOT NULL DEFAULT 0,
-    InheritUseEnhancedMode bit NOT NULL DEFAULT 0;
+ADD RedirectClipboard bit NOT NULL,
+	InheritRedirectClipboard bit NOT NULL,
+    VmId varchar NOT NULL DEFAULT NULL,
+    UseVmId bit NOT NULL,
+    UseEnhancedMode bit NOT NULL,
+    InheritVmId bit NOT NULL,
+    InheritUseVmId bit NOT NULL,
+    SSHTunnelConnectionName varchar NOT NULL DEFAULT NULL,
+    InheritSSHTunnelConnectionName bit NOT NULL,
+    SSHOptions varchar NOT NULL DEFAULT NULL,
+    InheritSSHOptions bit NOT NULL,
+    InheritUseEnhancedMode bit NOT NULL;
 UPDATE tblRoot
     SET ConfVersion='2.7'";
             var dbCommand = _databaseConnector.DbCommand(sqlText);
diff --git a/mRemoteNG/Config/Serializers/Versioning/SqlVersion28To29Upgrader.cs b/mRemoteNG/Config/Serializers/Versioning/SqlVersion28To29Upgrader.cs
index 55c9368f..de3a10d9 100644
--- a/mRemoteNG/Config/Serializers/Versioning/SqlVersion28To29Upgrader.cs
+++ b/mRemoteNG/Config/Serializers/Versioning/SqlVersion28To29Upgrader.cs
@@ -32,11 +32,11 @@ namespace mRemoteNG.Config.Serializers.Versioning
             // MYSQL
             const string mySqlAlter = @"
 ALTER TABLE tblCons ADD COLUMN `OpeningCommand` varchar(512) DEFAULT NULL;
-ALTER TABLE tblCons ADD COLUMN `InheritRDGatewayExternalCredentialProvider` tinyint(1) NOT NULL DEFAULT 0;
-ALTER TABLE tblCons ADD COLUMN `InheritRDGatewayUserViaAPI` tinyint(1) NOT NULL DEFAULT 0;
-ALTER TABLE tblCons ADD COLUMN `InheritExternalCredentialProvider` tinyint(1) NOT NULL DEFAULT 0;
-ALTER TABLE tblCons ADD COLUMN `InheritUseRCG` tinyint(1) NOT NULL DEFAULT 0;
-ALTER TABLE tblCons ADD COLUMN `InheritUserViaAPI` tinyint(1) NOT NULL DEFAULT 0;
+ALTER TABLE tblCons ADD COLUMN `InheritRDGatewayExternalCredentialProvider` tinyint(1) NOT NULL;
+ALTER TABLE tblCons ADD COLUMN `InheritRDGatewayUserViaAPI` tinyint(1) NOT NULL;
+ALTER TABLE tblCons ADD COLUMN `InheritExternalCredentialProvider` tinyint(1) NOT NULL;
+ALTER TABLE tblCons ADD COLUMN `InheritUseRCG` tinyint(1) NOT NULL;
+ALTER TABLE tblCons ADD COLUMN `InheritUserViaAPI` tinyint(1) NOT NULL;
 ALTER TABLE tblCons ADD COLUMN `EC2Region` varchar(32) DEFAULT NULL;
 ALTER TABLE tblCons ADD COLUMN `EC2InstanceId` varchar(32) DEFAULT NULL;
 ALTER TABLE tblCons ADD COLUMN `ExternalCredentialProvider` varchar(256) DEFAULT NULL;
@@ -49,17 +49,16 @@ ALTER TABLE tblRoot CHANGE COLUMN ConfVersion ConfVersion VARCHAR(15) NOT NULL;
             // MS-SQL
             const string msSqlAlter = @"
 ALTER TABLE tblCons ADD OpeningCommand VARCHAR(512) DEFAULT NULL;
-ALTER TABLE tblCons ADD InheritRDGatewayExternalCredentialProvider bit NOT NULL DEFAULT 0;
-ALTER TABLE tblCons ADD InheritRDGatewayUserViaAPI bit NOT NULL DEFAULT 0;
-ALTER TABLE tblCons ADD InheritExternalCredentialProvider bit NOT NULL DEFAULT 0;
-ALTER TABLE tblCons ADD InheritUseRCG bit NOT NULL DEFAULT 0;
-ALTER TABLE tblCons ADD InheritUserViaAPI bit NOT NULL DEFAULT 0;
-ALTER TABLE tblCons ADD EC2Region] varchar(32) NULL;
-ALTER TABLE tblCons ADD [EC2InstanceId] varchar(32) NULL;
-ALTER TABLE tblCons ADD [ExternalCredentialProvider] varchar(256) NULL;
-ALTER TABLE tblCons ADD [ExternalAddressProvider] varchar(256) NULL;
-
-ALTER TABLE tblRoot ALTER COLUMN ConfVersion VARCHAR(15);
+ALTER TABLE tblCons ADD InheritRDGatewayExternalCredentialProvider bit NOT NULL;
+ALTER TABLE tblCons ADD InheritRDGatewayUserViaAPI bit NOT NULL;
+ALTER TABLE tblCons ADD InheritExternalCredentialProvider bit NOT NULL;
+ALTER TABLE tblCons ADD InheritUseRCG bit NOT NULL;
+ALTER TABLE tblCons ADD InheritUserViaAPI bit NOT NULL;
+ALTER TABLE tblCons ADD EC2Region varchar(32) NULL;
+ALTER TABLE tblCons ADD EC2InstanceId varchar(32) NULL;
+ALTER TABLE tblCons ADD ExternalCredentialProvider varchar(256) NULL;
+ALTER TABLE tblCons ADD ExternalAddressProvider varchar(256) NULL;
+ALTER TABLE tblRoot ALTER COLUMN [ConfVersion] VARCHAR(15);
 ";
 
             const string msSqlUpdate = @"UPDATE tblRoot SET ConfVersion=@confVersion;";