diff --git a/web/pgadmin/browser/server_groups/servers/__init__.py b/web/pgadmin/browser/server_groups/servers/__init__.py
index d88363a..0634e3f 100644
--- a/web/pgadmin/browser/server_groups/servers/__init__.py
+++ b/web/pgadmin/browser/server_groups/servers/__init__.py
@@ -746,6 +746,8 @@ class ServerNode(PGChildNodeView):
                         _=gettext
                     )
                 )
+            else:
+                password = conn_passwd or server.password
         else:
             password = data['password'] if 'password' in data else None
             save_password = \
