diff --git a/web/pgadmin/browser/server_groups/servers/__init__.py b/web/pgadmin/browser/server_groups/servers/__init__.py
index be170db0e..f5534076b 100644
--- a/web/pgadmin/browser/server_groups/servers/__init__.py
+++ b/web/pgadmin/browser/server_groups/servers/__init__.py
@@ -1616,6 +1616,7 @@ class ServerNode(PGChildNodeView):
                         KEY_RING_SERVICE_NAME,
                         KEY_RING_USERNAME_FORMAT.format(server.name,
                                                         server.id))
+                prompt_password = True if password is None else False
         else:
             password = data['password'] if 'password' in data else None
             save_password = data['save_password']\