diff --git a/docs/en_US/images/permissions.png b/docs/en_US/images/permissions.png
index fc5fd483d..a7cfd2f3c 100644
Binary files a/docs/en_US/images/permissions.png and b/docs/en_US/images/permissions.png differ
diff --git a/web/pgadmin/browser/server_groups/servers/__init__.py b/web/pgadmin/browser/server_groups/servers/__init__.py
index ed1579702..dceae58db 100644
--- a/web/pgadmin/browser/server_groups/servers/__init__.py
+++ b/web/pgadmin/browser/server_groups/servers/__init__.py
@@ -719,6 +719,7 @@ class ServerNode(PGChildNodeView):
         return make_json_response(success=1,
                                   info=gettext("Server deleted"))
 
+    @permissions_required(AllPermissionTypes.object_register_server)
     @pga_login_required
     def update(self, gid, sid):
         """Update the server settings"""
diff --git a/web/pgadmin/browser/static/js/node.js b/web/pgadmin/browser/static/js/node.js
index cfc9528f9..e99c072b1 100644
--- a/web/pgadmin/browser/static/js/node.js
+++ b/web/pgadmin/browser/static/js/node.js
@@ -141,6 +141,7 @@ define('pgadmin.browser.node', [
             function() {
               return !!(self.canEdit(...arguments));
             } : (!!self.canEdit),
+          permission: self.type == 'server' ? AllPermissionTypes.OBJECT_REGISTER_SERVER : undefined,
         }]);
       }
 
@@ -161,7 +162,7 @@ define('pgadmin.browser.node', [
             function() {
               return !!(self.canDrop(...arguments));
             } : (!!self.canDrop),
-          permission: self.type == 'server' ? 'object_register_server' : undefined,
+          permission: self.type == 'server' ? AllPermissionTypes.OBJECT_REGISTER_SERVER : undefined,
         }]);
 
         if (self.canDropCascade) {
diff --git a/web/pgadmin/tools/user_management/PgAdminPermissions.py b/web/pgadmin/tools/user_management/PgAdminPermissions.py
index 0055d8002..206533ae4 100644
--- a/web/pgadmin/tools/user_management/PgAdminPermissions.py
+++ b/web/pgadmin/tools/user_management/PgAdminPermissions.py
@@ -48,12 +48,12 @@ class PgAdminPermissions:
         self.add_permission(
             AllPermissionCategories.object_explorer,
             AllPermissionTypes.object_register_server,
-            gettext("Register/remove server")
+            gettext("Manage Server")
         )
         self.add_permission(
             AllPermissionCategories.tools,
             AllPermissionTypes.tools_query_tool,
-            gettext("Query tool")
+            gettext("Query Tool")
         )
         self.add_permission(
             AllPermissionCategories.tools,
@@ -63,32 +63,32 @@ class PgAdminPermissions:
         self.add_permission(
             AllPermissionCategories.tools,
             AllPermissionTypes.tools_psql_tool,
-            gettext("PSQL tool")
+            gettext("PSQL Tool")
         )
         self.add_permission(
             AllPermissionCategories.tools,
             AllPermissionTypes.tools_backup,
-            gettext("Backup tool (including server and globals)")
+            gettext("Backup Tool (including server and globals)")
         )
         self.add_permission(
             AllPermissionCategories.tools,
             AllPermissionTypes.tools_restore,
-            gettext("Restore tool")
+            gettext("Restore Tool")
         )
         self.add_permission(
             AllPermissionCategories.tools,
             AllPermissionTypes.tools_import_export_data,
-            gettext("Import/export data")
+            gettext("Import/Export Data")
         )
         self.add_permission(
             AllPermissionCategories.tools,
             AllPermissionTypes.tools_import_export_servers,
-            gettext("Import/export servers")
+            gettext("Import/Export Servers")
         )
         self.add_permission(
             AllPermissionCategories.tools,
             AllPermissionTypes.tools_search_objects,
-            gettext("Search objects")
+            gettext("Search Objects")
         )
         self.add_permission(
             AllPermissionCategories.tools,
@@ -98,32 +98,32 @@ class PgAdminPermissions:
         self.add_permission(
             AllPermissionCategories.tools,
             AllPermissionTypes.tools_schema_diff,
-            gettext("Schema diff")
+            gettext("Schema Diff")
         )
         self.add_permission(
             AllPermissionCategories.tools,
             AllPermissionTypes.tools_grant_wizard,
-            gettext("Grant wizard")
+            gettext("Grant Wizard")
         )
         self.add_permission(
             AllPermissionCategories.tools,
             AllPermissionTypes.tools_erd_tool,
-            gettext("ERD tool")
+            gettext("ERD Tool")
         )
         self.add_permission(
             AllPermissionCategories.storage_manager,
             AllPermissionTypes.storage_add_folder,
-            gettext("Add folder")
+            gettext("Add Folder")
         )
         self.add_permission(
             AllPermissionCategories.storage_manager,
             AllPermissionTypes.storage_remove_folder,
-            gettext("Delete file/folder")
+            gettext("Delete File/Folder")
         )
         self.add_permission(
             AllPermissionCategories.miscellaneous,
             AllPermissionTypes.change_password,
-            gettext("Change password")
+            gettext("Change Password")
         )
 
     def add_permission(self, category: str, permission: str, label: str):