diff --git a/userguide/kaui/includes/plugin-manager.adoc b/userguide/kaui/includes/plugin-manager.adoc
index cfd6e4b20..4934a4b02 100644
--- a/userguide/kaui/includes/plugin-manager.adoc
+++ b/userguide/kaui/includes/plugin-manager.adoc
@@ -16,6 +16,11 @@ image::../assets/img/kaui/kpm_install.png[width=850,align="center"]
 . Click on the download icon next to the plugin that you wish to install.
 . Wait a few minutes, then refresh the web page.
 
+[NOTE]
+====
+If you have changed the default admin username or password in your `shiro.ini` file as explained https://docs.killbill.io/latest/user_management#_kill_bill_setup[here], you must also specify the corresponding values for `org.killbill.billing.plugin.kpm.adminUsername` and `org.killbill.billing.plugin.kpm.adminPassword` in your Kill Bill configuration (See https://docs.killbill.io/latest/userguide_configuration[docs]). Otherwise, plugin installation via Kaui will fail because the KPM plugin will not be able to authenticate with the correct credentials.
+====
+
 Once the plugin download is complete, it will appear in Stopped status. To start the plugin, click on the *Start* button.
 
 //COPIED FROM:
diff --git a/userguide/tutorials/plugin_installation.adoc b/userguide/tutorials/plugin_installation.adoc
index 22448166d..cbd6e4526 100644
--- a/userguide/tutorials/plugin_installation.adoc
+++ b/userguide/tutorials/plugin_installation.adoc
@@ -61,6 +61,11 @@ A key identifies each entry in that repository, and that key is the `pluginKey`.
 
 == Plugin Installation
 
+[NOTE]
+====
+If you have changed the default admin username or password in your `shiro.ini` file, you must also specify the corresponding values for `org.killbill.billing.plugin.kpm.adminUsername` and `org.killbill.billing.plugin.kpm.adminPassword` in your Kill Bill configuration. Otherwise, plugin installation (including via Kaui, KPM, or the API) will fail because the KPM plugin will not be able to authenticate with the correct credentials.
+====
+
 === Installing via Kaui
 
 In order to deploy a plugin via Kaui, you need to do the following:
@@ -274,5 +279,3 @@ curl -v \
 * https://docs.killbill.io/latest/plugin_management.html[_Plugin Management_]
 
 
-
-
diff --git a/userguide/tutorials/plugin_management.adoc b/userguide/tutorials/plugin_management.adoc
index d8241c2f2..047eed675 100644
--- a/userguide/tutorials/plugin_management.adoc
+++ b/userguide/tutorials/plugin_management.adoc
@@ -43,6 +43,11 @@ The following APIs are supported:
 
 === Installation
 
+[NOTE]
+====
+If you have changed the default admin username or password in your `shiro.ini` file as explained https://docs.killbill.io/latest/user_management#_kill_bill_setup[here], you must also specify the corresponding values for `org.killbill.billing.plugin.kpm.adminUsername` and `org.killbill.billing.plugin.kpm.adminPassword` in your Kill Bill configuration (See https://docs.killbill.io/latest/userguide_configuration[docs]). Otherwise, plugin installation (including via Kaui or the API) will fail because the KPM plugin will not be able to authenticate with the correct credentials.
+====
+
 The installation of a plugin occurs through the KPM plugin (which itself relies on KPM) and consists of the following sequence:
 
 * Download the binaries and install them on the filesystem at the right place