diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/UpgradeCli.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/UpgradeCli.java
index 346c9c9d2b..b5e001786c 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/UpgradeCli.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/UpgradeCli.java
@@ -218,7 +218,7 @@ private void initializeGlobalArguments() throws ArgumentException
                       .buildArgument();
       force =
               BooleanArgument.builder(OPTION_LONG_FORCE_UPGRADE)
-                      .description(INFO_UPGRADE_OPTION_FORCE.get(OPTION_LONG_NO_PROMPT))
+                      .description(INFO_UPGRADE_OPTION_FORCE.get(OPTION_LONG_ACCEPT_LICENSE, OPTION_LONG_NO_PROMPT))
                       .buildArgument();
       acceptLicense = acceptLicenseArgument();
       showUsageArgument = showUsageArgument();
diff --git a/opendj-server-legacy/src/messages/org/opends/messages/tool.properties b/opendj-server-legacy/src/messages/org/opends/messages/tool.properties
index 1c87085a3c..1704ec5ccc 100644
--- a/opendj-server-legacy/src/messages/org/opends/messages/tool.properties
+++ b/opendj-server-legacy/src/messages/org/opends/messages/tool.properties
@@ -2326,7 +2326,9 @@ should be used with caution and may be useful in automated deployments where pot
 known in advance and resolved after the upgrade has completed
 INFO_UPGRADE_OPTION_FORCE_1741=Forces a non-interactive upgrade to continue even if it requires user \
 interaction. In particular, long running or critical upgrade tasks, such as re-indexing, which \
-require user confirmation will be skipped. This option may only be used with the '%s' option
+require user confirmation will be performed. This option does not accept the license: if the \
+upgrade requires accepting a license, use the '%s' option. This option may only be used with the \
+'%s' option
 INFO_UPGRADE_DESCRIPTION_CLI_1743=Upgrades OpenDJ configuration and application data so that it is \
 compatible with the installed binaries.%n%nThis tool should be run immediately after upgrading \
 the OpenDJ binaries and before restarting the server.%n%nNOTE: this tool does not provide backup \