diff --git a/docs/en_US/change_password_dialog.rst b/docs/en_US/change_password_dialog.rst
index e057c4a4bf5..d5b7a5f558f 100644
--- a/docs/en_US/change_password_dialog.rst
+++ b/docs/en_US/change_password_dialog.rst
@@ -1,8 +1,8 @@
 .. _change_password_dialog:
 
-*******************************
-`Change Password Dialog`:index:
-*******************************
+**************************************
+`Change Server Password Dialog`:index:
+**************************************
 
 It is a good policy to routinely change your password to protect data, even in
 what you may consider a 'safe' environment. In the workplace, failure to apply
@@ -30,7 +30,9 @@ comprehensive list and they **will not guarantee security**.
     :alt: Change database password dialog
     :align: center
 
-Use the *Change Password* dialog to change your password:
+Use the *Change Server Password* dialog to change the password of the role that
+pgAdmin uses to connect to the database server, rather than the password you use
+to log in to pgAdmin itself:
 
 * The name displayed in the *User* field is the role for which you are modifying
   the password; it is the role that is associated with the server connection
diff --git a/docs/en_US/menu_bar.rst b/docs/en_US/menu_bar.rst
index 871de8799ae..7774fdbcc3d 100644
--- a/docs/en_US/menu_bar.rst
+++ b/docs/en_US/menu_bar.rst
@@ -72,7 +72,7 @@ following options (in alphabetical order):
 |                             |                                                                                                                          |
 |   2) *Deploy Cloud Instance*| Click to open the :ref:`Cloud Deployment <cloud_deployment>` dialog to deploy an cloud instance.                         |
 +-----------------------------+--------------------------------------------------------------------------------------------------------------------------+
-| *Change Password...*        | Click to open the :ref:`Change Password... <change_password_dialog>` dialog to change your password.                     |
+| *Change Server Password...* | Click to open the :ref:`Change Server Password... <change_password_dialog>` dialog to change the password.               |
 +-----------------------------+--------------------------------------------------------------------------------------------------------------------------+
 | *Clear Saved Password*      | If you have saved the database server password, click to clear the saved password.                                       |
 |                             | Enable only when password is already saved.                                                                              |
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 281d48093f3..77707f7b023 100644
--- a/web/pgadmin/browser/server_groups/servers/static/js/server.js
+++ b/web/pgadmin/browser/server_groups/servers/static/js/server.js
@@ -126,9 +126,9 @@ 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.'),
+            data_disabled: gettext('Please connect the server to enable Change Server Password.'),
           },
         },{
           name: 'wal_replay_pause', node: 'server', module: this,
@@ -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);
             });
diff --git a/web/pgadmin/static/js/Dialogs/index.jsx b/web/pgadmin/static/js/Dialogs/index.jsx
index 1bf4193daba..70227429b96 100644
--- a/web/pgadmin/static/js/Dialogs/index.jsx
+++ b/web/pgadmin/static/js/Dialogs/index.jsx
@@ -205,7 +205,7 @@ export function showChangeServerPassword() {
                 // Notify user to update pgpass file
                 if(isPgPassFileUsed) {
                   pgAdmin.Browser.notifier.alert(
-                    gettext('Change Password'),
+                    gettext('Change Server Password'),
                     gettext('Please make sure to disconnect the server'
                     + ' and update the new password in the pgpass file'
                       + ' before performing any other operation')