diff --git a/server/bundles/io.cloudbeaver.server/plugin.xml b/server/bundles/io.cloudbeaver.server/plugin.xml
index 3c1d6752a4..93a4bb342e 100644
--- a/server/bundles/io.cloudbeaver.server/plugin.xml
+++ b/server/bundles/io.cloudbeaver.server/plugin.xml
@@ -22,7 +22,7 @@
 
     <extension point="io.cloudbeaver.service">
         <service id="core" label="Core service" description="Core services" class="io.cloudbeaver.service.core.WebServiceBindingCore">
-            <permission id="public" label="Public access" category="general" scope="subject"/>
+            <permission id="public" label="Public access" category="general" scope="subject" description="Provides access to the data management interface"/>
             <permission id="access" label="Data source access" category="general" scope="datasource"/>
         </service>
         <service id="navigator" label="Database navigator" description="Database navigator services" class="io.cloudbeaver.service.navigator.WebServiceBindingNavigator">
diff --git a/server/bundles/io.cloudbeaver.service.admin/plugin.xml b/server/bundles/io.cloudbeaver.service.admin/plugin.xml
index 670cd647b6..c148923dc3 100644
--- a/server/bundles/io.cloudbeaver.service.admin/plugin.xml
+++ b/server/bundles/io.cloudbeaver.service.admin/plugin.xml
@@ -5,7 +5,7 @@
 
     <extension point="io.cloudbeaver.service">
         <service id="admin" label="User administration" description="User administration services" class="io.cloudbeaver.service.admin.WebServiceBindingAdmin">
-            <permission id="admin" label="Admin Full Access" category="admin" scope="subject"/>
+            <permission id="admin" label="Admin Full Access" category="admin" scope="subject" description="Provides access to the CloudBeaver configuration"/>
         </service>
     </extension>
 
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/Roles/Options/RoleOptions.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/Roles/Options/RoleOptions.tsx
index 4609f18446..9fd4b20a74 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/Roles/Options/RoleOptions.tsx
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/Roles/Options/RoleOptions.tsx
@@ -78,15 +78,22 @@ export const RoleOptions: TabContainerPanelComponent<IRoleFormProps> = observer(
         <Group small gap>
           <GroupTitle>{translate('administration_roles_role_permissions')}</GroupTitle>
           {permissionsResource.resource.values.map(permission => {
-            let label = permission.id;
-            let caption: string | undefined;
+            const label = permission.label ?? permission.id;
 
+            let caption = '';
+
+            if (permission.description) {
+              caption = permission.description;
+            } else if (permission.label) {
+              caption = `(${permission.id})`;
+            }
+
+            let tooltip = `${permission.id}`;
+
             if (permission.label) {
-              label = `${permission.label}`;
-              caption = permission.id;
+              tooltip = permission.label + ` (${permission.id})`;
             }
 
-            const tooltip = `${label}${permission.description ? '\n' + permission.description : ''}`;
             return (
               <FieldCheckbox
                 key={permission.id}
@@ -98,7 +105,8 @@ export const RoleOptions: TabContainerPanelComponent<IRoleFormProps> = observer(
                 readOnly={state.readonly}
                 disabled={state.disabled}
               >
-                {label} {caption && <caption>({caption})</caption>}
+                {label}
+                {caption ? <caption>{caption}</caption> : null}
               </FieldCheckbox>
             );
           })}