diff --git a/client/common/file.c b/client/common/file.c
index ffd31fd6e..4c9eda34d 100644
--- a/client/common/file.c
+++ b/client/common/file.c
@@ -1957,15 +1957,8 @@ BOOL freerdp_client_populate_settings_from_rdp_file_unchecked(const rdpFile* fil
 
 	if (~file->EnableRdsAadAuth)
 	{
-		if (!freerdp_settings_set_bool(settings, FreeRDP_AadSecurity, file->EnableRdsAadAuth != 0))
-			return FALSE;
-		if (!freerdp_settings_set_bool(settings, FreeRDP_RdstlsSecurity, TRUE))
-			return FALSE;
-		if (!freerdp_settings_set_bool(settings, FreeRDP_RdpSecurity, FALSE))
-			return FALSE;
-		if (!freerdp_settings_set_bool(settings, FreeRDP_TlsSecurity, FALSE))
-			return FALSE;
-		if (!freerdp_settings_set_bool(settings, FreeRDP_NlaSecurity, FALSE))
+		const BOOL val = file->EnableRdsAadAuth != 0;
+		if (!freerdp_settings_set_bool(settings, FreeRDP_AadSecurity, val))
 			return FALSE;
 	}
 
diff --git a/client/common/test/rdp-testcases/test1.json b/client/common/test/rdp-testcases/test1.json
index d7f8ac26c..f022a1a04 100644
--- a/client/common/test/rdp-testcases/test1.json
+++ b/client/common/test/rdp-testcases/test1.json
@@ -57,9 +57,9 @@
 		"FreeRDP_RemdeskVirtualChannel": false,
 		"FreeRDP_LyncRdpMode": false,
 		"FreeRDP_RemoteAssistanceRequestControl": false,
-		"FreeRDP_TlsSecurity": false,
-		"FreeRDP_NlaSecurity": false,
-		"FreeRDP_RdpSecurity": false,
+		"FreeRDP_TlsSecurity": true,
+		"FreeRDP_NlaSecurity": true,
+		"FreeRDP_RdpSecurity": true,
 		"FreeRDP_ExtSecurity": false,
 		"FreeRDP_Authentication": true,
 		"FreeRDP_NegotiateSecurityLayer": true,
@@ -67,7 +67,7 @@
 		"FreeRDP_DisableCredentialsDelegation": false,
 		"FreeRDP_VmConnectMode": false,
 		"FreeRDP_FIPSMode": false,
-		"FreeRDP_RdstlsSecurity": true,
+		"FreeRDP_RdstlsSecurity": false,
 		"FreeRDP_AadSecurity": false,
 		"FreeRDP_RemoteCredentialGuard": false,
 		"FreeRDP_RestrictedAdminModeSupported": true,
diff --git a/client/common/test/rdp-testcases/test1.unchecked.json b/client/common/test/rdp-testcases/test1.unchecked.json
index 16fc864e2..b0b635f5d 100644
--- a/client/common/test/rdp-testcases/test1.unchecked.json
+++ b/client/common/test/rdp-testcases/test1.unchecked.json
@@ -57,9 +57,9 @@
 		"FreeRDP_RemdeskVirtualChannel": false,
 		"FreeRDP_LyncRdpMode": false,
 		"FreeRDP_RemoteAssistanceRequestControl": false,
-		"FreeRDP_TlsSecurity": false,
-		"FreeRDP_NlaSecurity": false,
-		"FreeRDP_RdpSecurity": false,
+		"FreeRDP_TlsSecurity": true,
+		"FreeRDP_NlaSecurity": true,
+		"FreeRDP_RdpSecurity": true,
 		"FreeRDP_ExtSecurity": false,
 		"FreeRDP_Authentication": true,
 		"FreeRDP_NegotiateSecurityLayer": true,
@@ -67,7 +67,7 @@
 		"FreeRDP_DisableCredentialsDelegation": false,
 		"FreeRDP_VmConnectMode": false,
 		"FreeRDP_FIPSMode": false,
-		"FreeRDP_RdstlsSecurity": true,
+		"FreeRDP_RdstlsSecurity": false,
 		"FreeRDP_AadSecurity": false,
 		"FreeRDP_RemoteCredentialGuard": false,
 		"FreeRDP_RestrictedAdminModeSupported": true,
diff --git a/client/common/test/rdp-testcases/test2.json b/client/common/test/rdp-testcases/test2.json
index 85a626d55..ea0e1e5ff 100644
--- a/client/common/test/rdp-testcases/test2.json
+++ b/client/common/test/rdp-testcases/test2.json
@@ -57,9 +57,9 @@
 		"FreeRDP_RemdeskVirtualChannel": false,
 		"FreeRDP_LyncRdpMode": false,
 		"FreeRDP_RemoteAssistanceRequestControl": false,
-		"FreeRDP_TlsSecurity": false,
-		"FreeRDP_NlaSecurity": false,
-		"FreeRDP_RdpSecurity": false,
+		"FreeRDP_TlsSecurity": true,
+		"FreeRDP_NlaSecurity": true,
+		"FreeRDP_RdpSecurity": true,
 		"FreeRDP_ExtSecurity": false,
 		"FreeRDP_Authentication": true,
 		"FreeRDP_NegotiateSecurityLayer": true,
@@ -67,7 +67,7 @@
 		"FreeRDP_DisableCredentialsDelegation": false,
 		"FreeRDP_VmConnectMode": false,
 		"FreeRDP_FIPSMode": false,
-		"FreeRDP_RdstlsSecurity": true,
+		"FreeRDP_RdstlsSecurity": false,
 		"FreeRDP_AadSecurity": false,
 		"FreeRDP_RemoteCredentialGuard": false,
 		"FreeRDP_RestrictedAdminModeSupported": true,
diff --git a/client/common/test/rdp-testcases/test2.unchecked.json b/client/common/test/rdp-testcases/test2.unchecked.json
index 6fb5b47f4..0fa87ada7 100644
--- a/client/common/test/rdp-testcases/test2.unchecked.json
+++ b/client/common/test/rdp-testcases/test2.unchecked.json
@@ -57,9 +57,9 @@
 		"FreeRDP_RemdeskVirtualChannel": false,
 		"FreeRDP_LyncRdpMode": false,
 		"FreeRDP_RemoteAssistanceRequestControl": false,
-		"FreeRDP_TlsSecurity": false,
-		"FreeRDP_NlaSecurity": false,
-		"FreeRDP_RdpSecurity": false,
+		"FreeRDP_TlsSecurity": true,
+		"FreeRDP_NlaSecurity": true,
+		"FreeRDP_RdpSecurity": true,
 		"FreeRDP_ExtSecurity": false,
 		"FreeRDP_Authentication": true,
 		"FreeRDP_NegotiateSecurityLayer": true,
@@ -67,7 +67,7 @@
 		"FreeRDP_DisableCredentialsDelegation": false,
 		"FreeRDP_VmConnectMode": false,
 		"FreeRDP_FIPSMode": false,
-		"FreeRDP_RdstlsSecurity": true,
+		"FreeRDP_RdstlsSecurity": false,
 		"FreeRDP_AadSecurity": false,
 		"FreeRDP_RemoteCredentialGuard": false,
 		"FreeRDP_RestrictedAdminModeSupported": true,
diff --git a/client/common/test/rdp-testcases/test3.json b/client/common/test/rdp-testcases/test3.json
index d7f8ac26c..f022a1a04 100644
--- a/client/common/test/rdp-testcases/test3.json
+++ b/client/common/test/rdp-testcases/test3.json
@@ -57,9 +57,9 @@
 		"FreeRDP_RemdeskVirtualChannel": false,
 		"FreeRDP_LyncRdpMode": false,
 		"FreeRDP_RemoteAssistanceRequestControl": false,
-		"FreeRDP_TlsSecurity": false,
-		"FreeRDP_NlaSecurity": false,
-		"FreeRDP_RdpSecurity": false,
+		"FreeRDP_TlsSecurity": true,
+		"FreeRDP_NlaSecurity": true,
+		"FreeRDP_RdpSecurity": true,
 		"FreeRDP_ExtSecurity": false,
 		"FreeRDP_Authentication": true,
 		"FreeRDP_NegotiateSecurityLayer": true,
@@ -67,7 +67,7 @@
 		"FreeRDP_DisableCredentialsDelegation": false,
 		"FreeRDP_VmConnectMode": false,
 		"FreeRDP_FIPSMode": false,
-		"FreeRDP_RdstlsSecurity": true,
+		"FreeRDP_RdstlsSecurity": false,
 		"FreeRDP_AadSecurity": false,
 		"FreeRDP_RemoteCredentialGuard": false,
 		"FreeRDP_RestrictedAdminModeSupported": true,
diff --git a/client/common/test/rdp-testcases/test3.unchecked.json b/client/common/test/rdp-testcases/test3.unchecked.json
index 16fc864e2..b0b635f5d 100644
--- a/client/common/test/rdp-testcases/test3.unchecked.json
+++ b/client/common/test/rdp-testcases/test3.unchecked.json
@@ -57,9 +57,9 @@
 		"FreeRDP_RemdeskVirtualChannel": false,
 		"FreeRDP_LyncRdpMode": false,
 		"FreeRDP_RemoteAssistanceRequestControl": false,
-		"FreeRDP_TlsSecurity": false,
-		"FreeRDP_NlaSecurity": false,
-		"FreeRDP_RdpSecurity": false,
+		"FreeRDP_TlsSecurity": true,
+		"FreeRDP_NlaSecurity": true,
+		"FreeRDP_RdpSecurity": true,
 		"FreeRDP_ExtSecurity": false,
 		"FreeRDP_Authentication": true,
 		"FreeRDP_NegotiateSecurityLayer": true,
@@ -67,7 +67,7 @@
 		"FreeRDP_DisableCredentialsDelegation": false,
 		"FreeRDP_VmConnectMode": false,
 		"FreeRDP_FIPSMode": false,
-		"FreeRDP_RdstlsSecurity": true,
+		"FreeRDP_RdstlsSecurity": false,
 		"FreeRDP_AadSecurity": false,
 		"FreeRDP_RemoteCredentialGuard": false,
 		"FreeRDP_RestrictedAdminModeSupported": true,