diff --git a/packages/builder/src/components/backend/DataTable/modals/EditRoles.svelte b/packages/builder/src/components/backend/DataTable/modals/EditRoles.svelte
index b638d23168..949edc5ee1 100644
--- a/packages/builder/src/components/backend/DataTable/modals/EditRoles.svelte
+++ b/packages/builder/src/components/backend/DataTable/modals/EditRoles.svelte
@@ -84,7 +84,7 @@
       await roles.save(selectedRole)
       notifications.success("Role saved successfully")
     } catch (error) {
-      notifications.error("Error saving role")
+      notifications.error(`Error deleting role - ${error.message}`)
       return false
     }
   }
@@ -96,7 +96,8 @@
       changeRole()
       notifications.success("Role deleted successfully")
     } catch (error) {
-      notifications.error("Error deleting role")
+      notifications.error(`Error deleting role - ${error.message}`)
+      return false
     }
   }
 
@@ -139,7 +140,7 @@
     <Input
       label="Name"
       bind:value={selectedRole.name}
-      disabled={shouldDisableRoleInput}
+      disabled={!!selectedRoleId}
       error={roleNameError}
     />
     <Select
diff --git a/packages/server/src/api/controllers/role.ts b/packages/server/src/api/controllers/role.ts
index 57accfbbdc..a2369ef2da 100644
--- a/packages/server/src/api/controllers/role.ts
+++ b/packages/server/src/api/controllers/role.ts
@@ -1,9 +1,5 @@
-import { roles, context, events } from "@budibase/backend-core"
-import {
-  generateRoleID,
-  getUserMetadataParams,
-  InternalTables,
-} from "../../db/utils"
+import { roles, context, events, db as dbCore } from "@budibase/backend-core"
+import { getUserMetadataParams, InternalTables } from "../../db/utils"
 import { UserCtx, Database } from "@budibase/types"
 
 const UpdateRolesOptions = {
@@ -55,6 +51,7 @@ export async function save(ctx: UserCtx) {
   const db = context.getAppDB()
   let { _id, name, inherits, permissionId, version } = ctx.request.body
   let isCreate = false
+  const isNewVersion = version === roles.RoleIDVersion.NAME
 
   if (_id && roles.isBuiltin(_id)) {
     ctx.throw(400, "Cannot update builtin roles.")
@@ -62,12 +59,20 @@ export async function save(ctx: UserCtx) {
 
   // if not id found, then its creation
   if (!_id) {
-    _id = generateRoleID(name)
+    _id = dbCore.generateRoleID(name)
     isCreate = true
   }
   // version 2 roles need updated to add back role_
-  else if (version === roles.RoleIDVersion.NAME) {
-    _id = generateRoleID(name)
+  else if (isNewVersion) {
+    _id = dbCore.prefixRoleID(_id)
+  }
+
+  let dbRole
+  if (!isCreate) {
+    dbRole = await db.get(_id)
+  }
+  if (dbRole && dbRole.name !== name && isNewVersion) {
+    ctx.throw(400, "Cannot change custom role name")
   }
 
   const role = new roles.Role(_id, name, permissionId).addInheritance(inherits)
@@ -98,7 +103,7 @@ export async function destroy(ctx: UserCtx) {
     ctx.throw(400, "Cannot delete builtin role.")
   } else {
     // make sure has the prefix (if it has it then it won't be added)
-    roleId = generateRoleID(roleId)
+    roleId = dbCore.generateRoleID(roleId)
   }
   const role = await db.get(roleId)
   // first check no users actively attached to role