diff --git a/client/common/cmdline.c b/client/common/cmdline.c
index 89f95fddb..f0d8f199c 100644
--- a/client/common/cmdline.c
+++ b/client/common/cmdline.c
@@ -1292,10 +1292,6 @@ static BOOL ends_with(const char* str, const char* ext)
 static void activate_smartcard_logon_rdp(rdpSettings* settings)
 {
 	settings->SmartcardLogon = TRUE;
-	settings->RdpSecurity = TRUE;
-	settings->TlsSecurity = FALSE;
-	settings->NlaSecurity = FALSE;
-	settings->ExtSecurity = FALSE;
 	/* TODO: why not? settings->UseRdpSecurityLayer = TRUE; */
 	freerdp_set_param_bool(settings, FreeRDP_PasswordIsSmartcardPin, TRUE);
 }
@@ -2760,12 +2756,6 @@ int freerdp_client_settings_parse_command_line_arguments(rdpSettings* settings,
 		}
 		CommandLineSwitchCase(arg, "smartcard-logon")
 		{
-			if (!((0 == arg->Value) || (0 == strcmp(arg->Value, "rdp")) || (0 == strcmp(arg->Value, ""))))
-			{
-				/* Later,  we may implement --smartcard-logon:kerberos-sso or other variants. */
-				return COMMAND_LINE_ERROR_UNEXPECTED_VALUE;
-			}
-
 			if (!settings->SmartcardLogon)
 				activate_smartcard_logon_rdp(settings);
 		}
diff --git a/client/common/cmdline.h b/client/common/cmdline.h
index f75605256..7067a383d 100644
--- a/client/common/cmdline.h
+++ b/client/common/cmdline.h
@@ -158,7 +158,7 @@ static COMMAND_LINE_ARGUMENT_A args[] =
 	{ "size", COMMAND_LINE_VALUE_REQUIRED, "<width>x<height> or <percent>%[wh]", "1024x768", NULL, -1, NULL, "Screen size" },
 	{ "smart-sizing", COMMAND_LINE_VALUE_OPTIONAL, "<width>x<height>", NULL, NULL, -1, NULL, "Scale remote desktop to window size" },
 	{ "smartcard", COMMAND_LINE_VALUE_OPTIONAL, "<str>[,<str>…]", NULL, NULL, -1, NULL, "Redirect the smartcard devices containing any of the <str> in their names." },
-	{ "smartcard-logon", COMMAND_LINE_VALUE_OPTIONAL, "[rdp]", NULL, NULL, -1, NULL, "Selects Smartcard Logon authentication (thru rdp)" },
+	{ "smartcard-logon", COMMAND_LINE_VALUE_FLAG, NULL, NULL, NULL, -1, NULL, "Activates Smartcard Logon authentication. (EXPERIMENTAL: NLA not supported)" },
 	{ "sound", COMMAND_LINE_VALUE_OPTIONAL, "[sys:<sys>,][dev:<dev>,][format:<format>,][rate:<rate>,][channel:<channel>,][latency:<latency>,][quality:<quality>]", NULL, NULL, -1, "audio", "Audio output (sound)" },
 	{ "span", COMMAND_LINE_VALUE_FLAG, NULL, NULL, NULL, -1, NULL, "Span screen over multiple monitors" },
 	{ "spn-class", COMMAND_LINE_VALUE_REQUIRED, "<service-class>", NULL, NULL, -1, NULL, "SPN authentication service class" },