diff --git a/web/pgadmin/browser/server_groups/servers/__init__.py b/web/pgadmin/browser/server_groups/servers/__init__.py
index 369e3e24863..427bd7bb603 100644
--- a/web/pgadmin/browser/server_groups/servers/__init__.py
+++ b/web/pgadmin/browser/server_groups/servers/__init__.py
@@ -21,7 +21,7 @@
 from pgadmin.browser.utils import PGChildNodeView
 from pgadmin.utils.ajax import make_json_response, bad_request, forbidden, \
     make_response as ajax_response, internal_server_error, unauthorized, gone
-from pgadmin.utils.crypto import encrypt, decrypt, pqencryptpassword
+from pgadmin.utils.crypto import encrypt, decrypt
 from pgadmin.utils.menu import MenuItem
 from pgadmin.tools.sqleditor.utils.query_history import QueryHistory
 from pgadmin.tools.user_management.PgAdminPermissions import AllPermissionTypes
@@ -1881,16 +1881,11 @@ def change_password(self, gid, sid):
                     return unauthorized(gettext("Incorrect password."))
 
             # Hash new password before saving it.
-            if manager.sversion >= 100000:
-                password = conn.pq_encrypt_password_conn(data['newPassword'],
-                                                         manager.user)
-                if password is None:
-                    # Unable to encrypt the password so used the
-                    # old method of encryption
-                    password = pqencryptpassword(data['newPassword'],
-                                                 manager.user)
-            else:
-                password = pqencryptpassword(data['newPassword'], manager.user)
+            password = conn.pq_encrypt_password_conn(data['newPassword'],
+                                                     manager.user)
+            if password is None:
+                return internal_server_error(errormsg="Unable to"
+                                                      " change the password.")
 
             SQL = render_template(
                 "/servers/sql/#{0}#/change_password.sql".format(
diff --git a/web/pgadmin/browser/server_groups/servers/tests/test_password_change.py b/web/pgadmin/browser/server_groups/servers/tests/test_password_change.py
index 208943c2fd6..97dc8e19e6e 100644
--- a/web/pgadmin/browser/server_groups/servers/tests/test_password_change.py
+++ b/web/pgadmin/browser/server_groups/servers/tests/test_password_change.py
@@ -27,7 +27,6 @@ def setUp(self):
         utils.write_node_info("sid", server_dict)
 
     @patch('pgadmin.browser.server_groups.servers.render_template')
-    @patch('pgadmin.browser.server_groups.servers.pqencryptpassword')
     @patch('pgadmin.browser.server_groups.servers.decrypt')
     @patch('pgadmin.browser.server_groups.servers.get_driver')
     @patch('pgadmin.browser.server_groups.servers.db')
@@ -35,7 +34,7 @@ def setUp(self):
     @patch('pgadmin.browser.server_groups.servers.User')
     @patch('pgadmin.browser.server_groups.servers.current_user')
     def runTest(self, current_user_mock, user_mock, server_mock, db_mock,
-                get_driver_mock, decrypt_mock, pqencryptpassword_mock,
+                get_driver_mock, decrypt_mock,
                 render_template_mock):
 
         current_user_mock.id = 1
@@ -54,7 +53,6 @@ def runTest(self, current_user_mock, user_mock, server_mock, db_mock,
                  ['connection_execute_scalar_return_value'])
 
         decrypt_mock.return_value = self.manager.password
-        pqencryptpassword_mock.return_value = self.manager.password
 
         class TestMockServer():
             def __init__(self, name, sid, password, passfile):
diff --git a/web/pgadmin/settings/__init__.py b/web/pgadmin/settings/__init__.py
index 02a56fa95d0..3742f253d7a 100644
--- a/web/pgadmin/settings/__init__.py
+++ b/web/pgadmin/settings/__init__.py
@@ -513,7 +513,7 @@ def delete_tool_data(trans_id=None):
 
 def compute_md5_hash_file(file_path, chunk_size=8192):
     """Compute md5 hash for large files by reading in chunks."""
-    md5_hash = hashlib.md5()
+    md5_hash = hashlib.sha256()
 
     # Open the file in binary mode
     with open(file_path, "rb") as file:
diff --git a/web/pgadmin/utils/crypto.py b/web/pgadmin/utils/crypto.py
index d0621591151..ed7a5fc7251 100644
--- a/web/pgadmin/utils/crypto.py
+++ b/web/pgadmin/utils/crypto.py
@@ -76,38 +76,3 @@ def pad(key):
 
     # Add padding to make key 32 bytes long
     return key.ljust(32, padding_string)
-
-
-def pqencryptpassword(password, user):
-    """
-    pqencryptpassword -- to encrypt a password
-    This is intended to be used by client applications that wish to send
-    commands like ALTER USER joe PASSWORD 'pwd'.  The password need not
-    be sent in cleartext if it is encrypted on the client side.  This is
-    good because it ensures the cleartext password won't end up in logs,
-    pg_stat displays, etc. We export the function so that clients won't
-    be dependent on low-level details like whether the enceyption is MD5
-    or something else.
-
-    Arguments are the cleartext password, and the SQL name of the user it
-    is for.
-
-    Return value is "md5" followed by a 32-hex-digit MD5 checksum..
-
-    Args:
-      password:
-      user:
-
-    Returns:
-
-    """
-
-    m = hashlib.md5()
-
-    # Place salt at the end because it may be known by users trying to crack
-    # the MD5 output.
-
-    m.update(password.encode())
-    m.update(user.encode())
-
-    return "md5" + m.hexdigest()