diff --git a/docs/en_US/release_notes_9_16.rst b/docs/en_US/release_notes_9_16.rst
index a7ec92e1bee..05e88e6ea8a 100644
--- a/docs/en_US/release_notes_9_16.rst
+++ b/docs/en_US/release_notes_9_16.rst
@@ -25,3 +25,5 @@ Housekeeping
 
 Bug fixes
 *********
+
+  | `Issue #9230 <https://github.com/pgadmin-org/pgadmin4/issues/9230>`_ -  Renamed the server "Change Password" menu option and dialog to "Change Server Password" (including the connected username) to make clear it changes the PostgreSQL server password, not the pgAdmin login password.
diff --git a/web/pgadmin/browser/server_groups/servers/static/js/server.js b/web/pgadmin/browser/server_groups/servers/static/js/server.js
index 6e85877dabb..7ffc1d925cc 100644
--- a/web/pgadmin/browser/server_groups/servers/static/js/server.js
+++ b/web/pgadmin/browser/server_groups/servers/static/js/server.js
@@ -126,7 +126,7 @@ define('pgadmin.node.server', [
         },{
           name: 'change_password', node: 'server', module: this,
           applies: ['object'], callback: 'change_password',
-          label: gettext('Change Password...'), priority: 10,
+          label: gettext('Change Server Password...'), priority: 10,
           enable : 'is_connected',data: {
             data_disabled: gettext('Please connect server to enable change password.'),
           },
@@ -364,7 +364,11 @@ define('pgadmin.node.server', [
               if (res.success && res.data.is_pgpass) {
                 is_pgpass_file_used = true;
               }
-              showChangeServerPassword(gettext('Change Password'), d, obj, i, is_pgpass_file_used);
+              showChangeServerPassword(
+                d.user?.name
+                  ? gettext('Change Server Password (%s)', d.user.name)
+                  : gettext('Change Server Password'),
+                d, obj, i, is_pgpass_file_used);
             }).catch(function(error) {
               pgAdmin.Browser.notifier.pgRespErrorNotify(error);
             });