diff --git a/client/X11/xf_rail.c b/client/X11/xf_rail.c
index 0b4e992fe..33e1c48c4 100644
--- a/client/X11/xf_rail.c
+++ b/client/X11/xf_rail.c
@@ -999,17 +999,24 @@ static UINT xf_rail_server_system_param(RailClientContext* context,
 static UINT xf_rail_server_handshake(RailClientContext* context,
                                      const RAIL_HANDSHAKE_ORDER* handshake)
 {
-	RAIL_EXEC_ORDER exec;
-	RAIL_SYSPARAM_ORDER sysparam;
+	UINT status;
+	RAIL_EXEC_ORDER exec = { 0 };
+	RAIL_SYSPARAM_ORDER sysparam = { 0 };
 	RAIL_HANDSHAKE_ORDER clientHandshake;
-	RAIL_CLIENT_STATUS_ORDER clientStatus;
+	RAIL_CLIENT_STATUS_ORDER clientStatus = { 0 };
 	xfContext* xfc = (xfContext*) context->custom;
 	rdpSettings* settings = xfc->context.settings;
 	clientHandshake.buildNumber = 0x00001DB0;
-	context->ClientHandshake(context, &clientHandshake);
-	ZeroMemory(&clientStatus, sizeof(RAIL_CLIENT_STATUS_ORDER));
+	status = context->ClientHandshake(context, &clientHandshake);
+
+	if (status != CHANNEL_RC_OK)
+		return status;
+
 	clientStatus.flags = RAIL_CLIENTSTATUS_ALLOWLOCALMOVESIZE;
-	context->ClientInformation(context, &clientStatus);
+	status = context->ClientInformation(context, &clientStatus);
+
+	if (status != CHANNEL_RC_OK)
+		return status;
 
 	if (settings->RemoteAppLanguageBarSupported)
 	{
@@ -1018,7 +1025,6 @@ static UINT xf_rail_server_handshake(RailClientContext* context,
 		context->ClientLanguageBarInfo(context, &langBarInfo);
 	}
 
-	ZeroMemory(&sysparam, sizeof(RAIL_SYSPARAM_ORDER));
 	sysparam.params = 0;
 	sysparam.params |= SPI_MASK_SET_HIGH_CONTRAST;
 	sysparam.highContrast.colorScheme.string = NULL;
@@ -1038,13 +1044,15 @@ static UINT xf_rail_server_handshake(RailClientContext* context,
 	sysparam.workArea.right = settings->DesktopWidth;
 	sysparam.workArea.bottom = settings->DesktopHeight;
 	sysparam.dragFullWindows = FALSE;
-	context->ClientSystemParam(context, &sysparam);
-	ZeroMemory(&exec, sizeof(RAIL_EXEC_ORDER));
+	status = context->ClientSystemParam(context, &sysparam);
+
+	if (status != CHANNEL_RC_OK)
+		return status;
+
 	exec.RemoteApplicationProgram = settings->RemoteApplicationProgram;
 	exec.RemoteApplicationWorkingDir = settings->ShellWorkingDirectory;
 	exec.RemoteApplicationArguments = settings->RemoteApplicationCmdLine;
-	context->ClientExecute(context, &exec);
-	return CHANNEL_RC_OK;
+	return context->ClientExecute(context, &exec);
 }
 
 /**
diff --git a/include/freerdp/rail.h b/include/freerdp/rail.h
index 57ed242ec..993a1a237 100644
--- a/include/freerdp/rail.h
+++ b/include/freerdp/rail.h
@@ -44,6 +44,7 @@
 #define RAIL_EXEC_FLAG_TRANSLATE_FILES			0x0002
 #define RAIL_EXEC_FLAG_FILE				0x0004
 #define RAIL_EXEC_FLAG_EXPAND_ARGUMENTS			0x0008
+#define RAIL_EXEC_FLAG_APP_USER_MODEL_ID	0x0010
 
 /* Server Execute Result PDU */
 #define RAIL_EXEC_S_OK					0x0000