diff --git a/client/web/admin/src/components/Settings/Compose/CComposeEditorBasic.vue b/client/web/admin/src/components/Settings/Compose/CComposeEditorBasic.vue
index 40185722a..143e86d2e 100644
--- a/client/web/admin/src/components/Settings/Compose/CComposeEditorBasic.vue
+++ b/client/web/admin/src/components/Settings/Compose/CComposeEditorBasic.vue
@@ -125,7 +125,7 @@
 
     <template #footer>
       <c-button-submit
-        :disabled="!canManage"
+        v-if="canManage"
         :processing="processing"
         :success="success"
         :text="$t('admin:general.label.submit')"
diff --git a/client/web/admin/src/components/Settings/Compose/CComposeEditorUI.vue b/client/web/admin/src/components/Settings/Compose/CComposeEditorUI.vue
index 6a89135b1..2ce96f502 100644
--- a/client/web/admin/src/components/Settings/Compose/CComposeEditorUI.vue
+++ b/client/web/admin/src/components/Settings/Compose/CComposeEditorUI.vue
@@ -70,7 +70,7 @@
 
     <template #footer>
       <c-button-submit
-        :disabled="!canManage"
+        v-if="canManage"
         :processing="processing"
         :success="success"
         :text="$t('admin:general.label.submit')"
diff --git a/client/web/admin/src/components/Settings/System/CSystemEditorAuth.vue b/client/web/admin/src/components/Settings/System/CSystemEditorAuth.vue
index 3ace54601..e4b6b3e41 100644
--- a/client/web/admin/src/components/Settings/System/CSystemEditorAuth.vue
+++ b/client/web/admin/src/components/Settings/System/CSystemEditorAuth.vue
@@ -470,7 +470,7 @@
 
     <template #footer>
       <c-button-submit
-        :disabled="!canManage"
+        v-if="canManage"
         :processing="processing"
         :success="success"
         :text="$t('admin:general.label.submit')"
diff --git a/client/web/admin/src/components/Settings/System/CSystemEditorAuthBgScreen.vue b/client/web/admin/src/components/Settings/System/CSystemEditorAuthBgScreen.vue
index 537f95df5..0aaf54340 100644
--- a/client/web/admin/src/components/Settings/System/CSystemEditorAuthBgScreen.vue
+++ b/client/web/admin/src/components/Settings/System/CSystemEditorAuthBgScreen.vue
@@ -83,7 +83,7 @@
 
     <template #footer>
       <c-button-submit
-        :disabled="!canManage"
+        v-if="canManage"
         :processing="processing"
         :success="success"
         :text="$t('admin:general.label.submit')"
diff --git a/client/web/admin/src/components/Settings/UI/CUIBrandingEditor.vue b/client/web/admin/src/components/Settings/UI/CUIBrandingEditor.vue
index e899ada3b..313d81b03 100644
--- a/client/web/admin/src/components/Settings/UI/CUIBrandingEditor.vue
+++ b/client/web/admin/src/components/Settings/UI/CUIBrandingEditor.vue
@@ -41,7 +41,7 @@
 
     <template #footer>
       <c-button-submit
-        :disabled="!canManage"
+        v-if="canManage"
         :processing="processing"
         :success="success"
         :text="$t('admin:general.label.submit')"
diff --git a/client/web/admin/src/components/Settings/UI/CUICustomCSS.vue b/client/web/admin/src/components/Settings/UI/CUICustomCSS.vue
index 0e802986a..c72bd2ae3 100644
--- a/client/web/admin/src/components/Settings/UI/CUICustomCSS.vue
+++ b/client/web/admin/src/components/Settings/UI/CUICustomCSS.vue
@@ -48,7 +48,7 @@
 
     <template #footer>
       <c-button-submit
-        :disabled="!canManage"
+        v-if="canManage"
         :processing="processing"
         :success="success"
         :text="$t('admin:general.label.submit')"
diff --git a/client/web/admin/src/components/Settings/UI/CUITopbarSettings.vue b/client/web/admin/src/components/Settings/UI/CUITopbarSettings.vue
index e79653c62..5c6401eb6 100644
--- a/client/web/admin/src/components/Settings/UI/CUITopbarSettings.vue
+++ b/client/web/admin/src/components/Settings/UI/CUITopbarSettings.vue
@@ -202,7 +202,7 @@
 
     <template #footer>
       <c-button-submit
-        :disabled="!canManage"
+        v-if="canManage"
         :processing="processing"
         :success="success"
         :text="$t('admin:general.label.submit')"
diff --git a/client/web/workflow/src/components/WorkflowEditor.vue b/client/web/workflow/src/components/WorkflowEditor.vue
index b969f3bb9..8812f0a69 100644
--- a/client/web/workflow/src/components/WorkflowEditor.vue
+++ b/client/web/workflow/src/components/WorkflowEditor.vue
@@ -197,11 +197,10 @@
         style="z-index: 1; width: 20vw;"
       >
         <c-button-submit
-          v-if="changeDetected"
+          v-if="changeDetected && canUpdateWorkflow"
           data-test-id="button-save-workflow"
           variant="dark"
           block
-          :disabled="processing || !canUpdateWorkflow"
           :processing="processingSave"
           :text="$t('editor:detected-changes') + `${canUpdateWorkflow ? this.$t('editor:click-to-save') : ''}`"
           :loading-text="$t('editor:saving')"