diff --git a/docs/en_US/release_notes_7_5.rst b/docs/en_US/release_notes_7_5.rst
index c27faf68ee0..4d54fc66558 100644
--- a/docs/en_US/release_notes_7_5.rst
+++ b/docs/en_US/release_notes_7_5.rst
@@ -42,6 +42,7 @@ Bug fixes
   | `Issue #6317 <https://github.com/pgadmin-org/pgadmin4/issues/6317>`_ -  Fix an issue where queries longer than 1 minute get stuck - Container 7.1
   | `Issue #6356 <https://github.com/pgadmin-org/pgadmin4/issues/6356>`_ -  Fix an issue where queries get stuck with auto-completion enabled.
   | `Issue #6364 <https://github.com/pgadmin-org/pgadmin4/issues/6364>`_ -  Fixed Query Tool/ PSQL tool tab title not getting updated on database rename.
+  | `Issue #6489 <https://github.com/pgadmin-org/pgadmin4/issues/6489>`_ -  Fix an issue where the edit server fails in desktop mode if the server password is not stored.
   | `Issue #6499 <https://github.com/pgadmin-org/pgadmin4/issues/6499>`_ -  Ensure that Backup, Restore, and Maintenance should work properly when pgpass file is used.
   | `Issue #6501 <https://github.com/pgadmin-org/pgadmin4/issues/6501>`_ -  Fix the query tool auto-complete issue on the server reconnection.
   | `Issue #6502 <https://github.com/pgadmin-org/pgadmin4/issues/6502>`_ -  Fix the query tool restore connection issue.
diff --git a/web/pgadmin/tools/backup/static/js/backup.ui.js b/web/pgadmin/tools/backup/static/js/backup.ui.js
index 458d6b5ca76..47988f964ff 100644
--- a/web/pgadmin/tools/backup/static/js/backup.ui.js
+++ b/web/pgadmin/tools/backup/static/js/backup.ui.js
@@ -638,7 +638,8 @@ export default class BackupSchema extends BaseUISchema {
         state.enable_row_security = false;
         return true;
       },
-      visible: isVisibleForServerBackup(obj.backupType)
+      visible: isVisibleForServerBackup(obj.backupType),
+      helpMessage: gettext('This option is enabled only when Use INSERT Commands is enabled.')
     }, {
       id: 'with_oids',
       label: gettext('With OID(s)'),
@@ -646,7 +647,7 @@ export default class BackupSchema extends BaseUISchema {
       deps: ['use_column_inserts', 'use_insert_commands'],
       group: gettext('Table Options'),
       disabled: function(state) {
-        let serverInfo = _.isUndefined(obj.fieldOptions.nodeInfo) ? undefined : obj.fieldOptions.nodeInfo.server;
+        let serverInfo = _.isUndefined(obj.treeNodeInfo) ? undefined : obj.treeNodeInfo.server;
 
         if (!_.isUndefined(serverInfo) && serverInfo.version >= 120000)
           return true;
diff --git a/web/pgadmin/tools/psql/static/js/psql_module.js b/web/pgadmin/tools/psql/static/js/psql_module.js
index 242cd53f4e3..7855eaddba6 100644
--- a/web/pgadmin/tools/psql/static/js/psql_module.js
+++ b/web/pgadmin/tools/psql/static/js/psql_module.js
@@ -235,7 +235,7 @@ export function initialize(gettext, url_for, _, pgAdmin, csrfToken, Browser) {
       let closeUrl = url_for('psql.close', {
         trans_id: transId,
       });
-      return [openUrl, closeUrl, pData.database._label];
+      return [openUrl, closeUrl, _.escape(pData.database._label)];
     },
     psql_terminal: function() {
       // theme colors