diff --git a/packages/builder/src/components/backend/DataTable/modals/EditRoles.svelte b/packages/builder/src/components/backend/DataTable/modals/EditRoles.svelte
index b638d23168..6a2dd8d913 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 saving 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/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Settings.svelte b/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Settings.svelte
new file mode 100644
index 0000000000..894b705a30
--- /dev/null
+++ b/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Settings.svelte
@@ -0,0 +1,38 @@
+<script>
+  import { Body, Button, Layout, notifications } from "@budibase/bbui"
+  import Panel from "./Panel.svelte"
+  import { API } from "api"
+  import { downloadText } from "@budibase/frontend-core"
+
+  export let datasource
+
+  async function download() {
+    if (!datasource?._id) {
+      notifications.error("Datasource invalid")
+    }
+    const response = await API.fetchExternalSchema(datasource._id)
+    downloadText(`${datasource.name}-dump.sql`, response.schema)
+  }
+</script>
+
+<Panel>
+  <div class="main">
+    <Layout gap="S" noPadding>
+      <Body size="L" weight="700">Troubleshooting</Body>
+      <Body>Download your schema to share with the Budibase team</Body>
+      <div class="download-button">
+        <Button cta on:click={download}>Download</Button>
+      </div>
+    </Layout>
+  </div>
+</Panel>
+
+<style>
+  .main {
+    margin-top: calc(var(--spacing-l) * -1);
+  }
+
+  .download-button {
+    padding-top: var(--spacing-s);
+  }
+</style>
diff --git a/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/index.svelte b/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/index.svelte
index ad71d15c24..6ce9cf7921 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/index.svelte
@@ -10,6 +10,8 @@
   import RestAuthenticationPanel from "./_components/panels/Authentication/index.svelte"
   import RestVariablesPanel from "./_components/panels/Variables/index.svelte"
   import PromptQueryModal from "./_components/PromptQueryModal.svelte"
+  import SettingsPanel from "./_components/panels/Settings.svelte"
+  import { helpers } from "@budibase/shared-core"
 
   let selectedPanel = null
   let panelOptions = []
@@ -38,6 +40,10 @@
       panelOptions = ["Queries"]
       selectedPanel = "Queries"
     }
+    // always the last option for SQL
+    if (helpers.isSQL(datasource)) {
+      panelOptions.push("Settings")
+    }
   }
 </script>
 
@@ -81,6 +87,8 @@
       <RestAuthenticationPanel {datasource} />
     {:else if selectedPanel === "Variables"}
       <RestVariablesPanel {datasource} />
+    {:else if selectedPanel === "Settings"}
+      <SettingsPanel {datasource} />
     {:else}
       <Body>Something went wrong</Body>
     {/if}
diff --git a/packages/frontend-core/src/api/datasources.js b/packages/frontend-core/src/api/datasources.js
index 1ba17cc610..7cc05960d7 100644
--- a/packages/frontend-core/src/api/datasources.js
+++ b/packages/frontend-core/src/api/datasources.js
@@ -83,4 +83,10 @@ export const buildDatasourceEndpoints = API => ({
       body: { datasource },
     })
   },
+
+  fetchExternalSchema: async datasourceId => {
+    return await API.get({
+      url: `/api/datasources/${datasourceId}/schema/external`,
+    })
+  },
 })
diff --git a/packages/frontend-core/src/utils/download.js b/packages/frontend-core/src/utils/download.js
new file mode 100644
index 0000000000..681bc8648e
--- /dev/null
+++ b/packages/frontend-core/src/utils/download.js
@@ -0,0 +1,13 @@
+export function downloadText(filename, text) {
+  if (typeof text === "object") {
+    text = JSON.stringify(text)
+  }
+  const blob = new Blob([text], { type: "plain/text" })
+  const url = URL.createObjectURL(blob)
+  const link = document.createElement("a")
+  link.href = url
+  link.download = filename
+  link.click()
+
+  URL.revokeObjectURL(url)
+}
diff --git a/packages/frontend-core/src/utils/index.js b/packages/frontend-core/src/utils/index.js
index 26e44410ba..dd04dd6c28 100644
--- a/packages/frontend-core/src/utils/index.js
+++ b/packages/frontend-core/src/utils/index.js
@@ -5,3 +5,4 @@ export * as RoleUtils from "./roles"
 export * as Utils from "./utils"
 export { memo, derivedMemo } from "./memo"
 export { createWebsocket } from "./websocket"
+export { downloadText } from "./download"
diff --git a/packages/server/src/api/controllers/datasource.ts b/packages/server/src/api/controllers/datasource.ts
index 3ca8a8131a..8cf0f3a98e 100644
--- a/packages/server/src/api/controllers/datasource.ts
+++ b/packages/server/src/api/controllers/datasource.ts
@@ -427,8 +427,8 @@ export async function destroy(ctx: UserCtx) {
 }
 
 export async function find(ctx: UserCtx) {
-  const database = context.getAppDB()
-  const datasource = await database.get(ctx.params.datasourceId)
+  const db = context.getAppDB()
+  const datasource = await db.get(ctx.params.datasourceId)
   ctx.body = await sdk.datasources.removeSecretSingle(datasource)
 }
 
@@ -443,7 +443,8 @@ export async function query(ctx: UserCtx) {
 }
 
 export async function getExternalSchema(ctx: UserCtx) {
-  const { datasource } = ctx.request.body
+  const db = context.getAppDB()
+  const datasource = await db.get(ctx.params.datasourceId)
   const enrichedDatasource = await getAndMergeDatasource(datasource)
   const connector = await getConnector(enrichedDatasource)
 
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
diff --git a/packages/server/src/integrations/utils.ts b/packages/server/src/integrations/utils.ts
index cc3caa6d5b..75deaf7f30 100644
--- a/packages/server/src/integrations/utils.ts
+++ b/packages/server/src/integrations/utils.ts
@@ -1,6 +1,7 @@
 import { SourceName, SqlQuery, Datasource, Table } from "@budibase/types"
 import { DocumentType, SEPARATOR } from "../db/utils"
 import { FieldTypes, BuildSchemaErrors, InvalidColumns } from "../constants"
+import { helpers } from "@budibase/shared-core"
 
 const DOUBLE_SEPARATOR = `${SEPARATOR}${SEPARATOR}`
 const ROW_ID_REGEX = /^\[.*]$/g
@@ -178,18 +179,7 @@ export function getSqlQuery(query: SqlQuery | string): SqlQuery {
   }
 }
 
-export function isSQL(datasource: Datasource): boolean {
-  if (!datasource || !datasource.source) {
-    return false
-  }
-  const SQL = [
-    SourceName.POSTGRES,
-    SourceName.SQL_SERVER,
-    SourceName.MYSQL,
-    SourceName.ORACLE,
-  ]
-  return SQL.indexOf(datasource.source) !== -1
-}
+export const isSQL = helpers.isSQL
 
 export function isIsoDateString(str: string) {
   if (!/\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}.\d{3}Z/.test(str)) {
diff --git a/packages/shared-core/src/helpers/integrations.ts b/packages/shared-core/src/helpers/integrations.ts
index a7b74885d8..b8c220c6a5 100644
--- a/packages/shared-core/src/helpers/integrations.ts
+++ b/packages/shared-core/src/helpers/integrations.ts
@@ -1,5 +1,18 @@
-import { SourceName } from "@budibase/types"
+import { Datasource, SourceName } from "@budibase/types"
 
 export function isGoogleSheets(type: SourceName) {
   return type === SourceName.GOOGLE_SHEETS
 }
+
+export function isSQL(datasource: Datasource): boolean {
+  if (!datasource || !datasource.source) {
+    return false
+  }
+  const SQL = [
+    SourceName.POSTGRES,
+    SourceName.SQL_SERVER,
+    SourceName.MYSQL,
+    SourceName.ORACLE,
+  ]
+  return SQL.indexOf(datasource.source) !== -1
+}
