diff --git a/gradle/changelog/custom_permission_role.yaml b/gradle/changelog/custom_permission_role.yaml
new file mode 100644
index 0000000000..0c8d2f347c
--- /dev/null
+++ b/gradle/changelog/custom_permission_role.yaml
@@ -0,0 +1,2 @@
+- type: changed
+  description: Show "CUSTOM" name instead empty entry for permission roles ([#1597](https://github.com/scm-manager/scm-manager/pull/1597))
diff --git a/scm-ui/ui-webapp/src/repos/permissions/components/RoleSelector.tsx b/scm-ui/ui-webapp/src/repos/permissions/components/RoleSelector.tsx
index 45bc9df4a8..cf497c37f5 100644
--- a/scm-ui/ui-webapp/src/repos/permissions/components/RoleSelector.tsx
+++ b/scm-ui/ui-webapp/src/repos/permissions/components/RoleSelector.tsx
@@ -31,11 +31,7 @@ type Props = {
   label?: string;
   helpText?: string;
   loading?: boolean;
-};
-
-const emptyOption = {
-  label: "",
-  value: ""
+  emptyLabel?: string;
 };
 
 const createSelectOptions = (roles: string[]) => {
@@ -47,11 +43,13 @@ const createSelectOptions = (roles: string[]) => {
   });
 };
 
-const RoleSelector: FC<Props> = ({ availableRoles, role, handleRoleChange, loading, label, helpText }) => {
+const RoleSelector: FC<Props> = ({ availableRoles, role, handleRoleChange, loading, label, helpText, emptyLabel }) => {
   if (!availableRoles) {
     return null;
   }
-  const options = role ? createSelectOptions(availableRoles) : [emptyOption, ...createSelectOptions(availableRoles)];
+  const options = role
+    ? createSelectOptions(availableRoles)
+    : [{ label: emptyLabel || "", value: "" }, ...createSelectOptions(availableRoles)];
 
   return (
     <Select
diff --git a/scm-ui/ui-webapp/src/repos/permissions/containers/CreatePermissionForm.tsx b/scm-ui/ui-webapp/src/repos/permissions/containers/CreatePermissionForm.tsx
index 5ac02d8466..95d32d8b87 100644
--- a/scm-ui/ui-webapp/src/repos/permissions/containers/CreatePermissionForm.tsx
+++ b/scm-ui/ui-webapp/src/repos/permissions/containers/CreatePermissionForm.tsx
@@ -164,6 +164,7 @@ const CreatePermissionForm: FC<Props> = ({
           selectedVerbs={selectedVerbs || []}
           onClose={() => setShowAdvancedDialog(false)}
           onSubmit={submitAdvancedPermissionsDialog}
+          readOnly={!create}
         />
       ) : null}
       <ErrorNotification error={error} />
@@ -212,6 +213,7 @@ const CreatePermissionForm: FC<Props> = ({
                   helpText={t("permission.help.roleHelpText")}
                   handleRoleChange={handleRoleChange}
                   role={permission.role || ""}
+                  emptyLabel={t("permission.custom")}
                 />
               </div>
               <div className="column">
diff --git a/scm-ui/ui-webapp/src/repos/permissions/containers/SinglePermission.tsx b/scm-ui/ui-webapp/src/repos/permissions/containers/SinglePermission.tsx
index 369c3048b1..a99a4b305e 100644
--- a/scm-ui/ui-webapp/src/repos/permissions/containers/SinglePermission.tsx
+++ b/scm-ui/ui-webapp/src/repos/permissions/containers/SinglePermission.tsx
@@ -111,6 +111,7 @@ const SinglePermission: FC<Props> = ({
             availableRoles={availableRoleNames}
             role={permission.role || ""}
             loading={isLoading}
+            emptyLabel={t("permission.custom")}
           />
         </td>
       )}