diff --git a/docs/en_US/release_notes_9_4.rst b/docs/en_US/release_notes_9_4.rst
index 20fb27558..781c3dcb0 100644
--- a/docs/en_US/release_notes_9_4.rst
+++ b/docs/en_US/release_notes_9_4.rst
@@ -31,6 +31,7 @@ Bug fixes
 *********
 
   | `Issue #6564 <https://github.com/pgadmin-org/pgadmin4/issues/6564>`_ -  Fix the issue where an error is displayed when a table is dropped while a query is running.
+  | `Issue #8595 <https://github.com/pgadmin-org/pgadmin4/issues/8595>`_ -  Enhance contrast for selected and hovered items in the Object Explorer to improve visibility and accessibility.
   | `Issue #8607 <https://github.com/pgadmin-org/pgadmin4/issues/8607>`_ -  Fixed an issue where the query tool returns "cannot unpack non-iterable Response object" when running any query with a database name change.
   | `Issue #8668 <https://github.com/pgadmin-org/pgadmin4/issues/8668>`_ -  Implement API fetch error display for select dropdown.
   | `Issue #8713 <https://github.com/pgadmin-org/pgadmin4/issues/8713>`_ -  Fixed issues related to column range selection using shift + click.
\ No newline at end of file
diff --git a/web/pgadmin/authenticate/ldap.py b/web/pgadmin/authenticate/ldap.py
index 2e34fb2b3..65ad8196e 100644
--- a/web/pgadmin/authenticate/ldap.py
+++ b/web/pgadmin/authenticate/ldap.py
@@ -187,11 +187,11 @@ class LDAPAuthentication(BaseAuthentication):
         """Add the ldap user to the internal SQLite database."""
         if config.LDAP_AUTO_CREATE_USER:
             if config.LDAP_DN_CASE_SENSITIVE:
-                user = User.query.filter_by(username=self.username).first()
+                user = User.query.filter_by(username=self.username,
+                                            auth_source=LDAP).first()
             else:
-                user = User.query.filter(
-                    func.lower(User.username) == func.lower(
-                        self.username)).first()
+                user = User.query.filter_by(username=func.lower(self.username),
+                                            auth_source=LDAP).first()
 
             if user is None:
                 create_msg = ("Creating user {0} with email {1} "
diff --git a/web/pgadmin/static/js/helpers/ModalProvider.jsx b/web/pgadmin/static/js/helpers/ModalProvider.jsx
index abf3d245f..5a3638364 100644
--- a/web/pgadmin/static/js/helpers/ModalProvider.jsx
+++ b/web/pgadmin/static/js/helpers/ModalProvider.jsx
@@ -106,7 +106,7 @@ function confirmDelete(title, text, onDeleteClick, onCancelClick, deleteLabel =
     title,
     (closeModal)=>{
       const handleOkClose = (callback) => {
-        callback();
+        callback?.();
         closeModal();
       };
       return (