diff --git a/client/common/cmdline.c b/client/common/cmdline.c
index 12ab61ab0..72be77a82 100644
--- a/client/common/cmdline.c
+++ b/client/common/cmdline.c
@@ -135,6 +135,7 @@ COMMAND_LINE_ARGUMENT_A args[] =
 	{ "version", COMMAND_LINE_VALUE_FLAG | COMMAND_LINE_PRINT_VERSION, NULL, NULL, NULL, -1, NULL, "print version" },
 	{ "help", COMMAND_LINE_VALUE_FLAG | COMMAND_LINE_PRINT_HELP, NULL, NULL, NULL, -1, "?", "print help" },
 	{ "play-rfx", COMMAND_LINE_VALUE_REQUIRED, "<pcap file>", NULL, NULL, -1, NULL, "Replay rfx pcap file" },
+	{ "auth-only", COMMAND_LINE_VALUE_BOOL, NULL, BoolValueFalse, NULL, -1, NULL, "Authenticate only." },
 	{ NULL, 0, NULL, NULL, NULL, -1, NULL, NULL }
 };
 
@@ -1602,6 +1603,10 @@ int freerdp_client_parse_command_line_arguments(int argc, char** argv, rdpSettin
 			settings->PlayRemoteFxFile = _strdup(arg->Value);
 			settings->PlayRemoteFx = TRUE;
 		}
+		CommandLineSwitchCase(arg, "auth-only")
+		{
+			settings->AuthenticationOnly = arg->Value ? TRUE : FALSE;
+		}
 		CommandLineSwitchDefault(arg)
 		{