diff --git a/src/prefabs/backOffice.tsx b/src/prefabs/backOffice.tsx
index a51e903f7..d9b239ae3 100644
--- a/src/prefabs/backOffice.tsx
+++ b/src/prefabs/backOffice.tsx
@@ -553,7 +553,16 @@ const interactions: PrefabInteraction[] = [
   {
     type: InteractionType.Custom,
     name: 'Enable',
-    sourceEvent: 'onActionDone',
+    sourceEvent: 'onActionSuccess',
+    ref: {
+      targetComponentId: '#createSubmitButton',
+      sourceComponentId: '#createForm',
+    },
+  },
+  {
+    type: InteractionType.Custom,
+    name: 'Enable',
+    sourceEvent: 'onActionError',
     ref: {
       targetComponentId: '#createSubmitButton',
       sourceComponentId: '#createForm',
@@ -571,7 +580,16 @@ const interactions: PrefabInteraction[] = [
   {
     type: InteractionType.Custom,
     name: 'Enable',
-    sourceEvent: 'onActionDone',
+    sourceEvent: 'onActionSuccess',
+    ref: {
+      targetComponentId: '#editSubmitButton',
+      sourceComponentId: '#updateForm',
+    },
+  },
+  {
+    type: InteractionType.Custom,
+    name: 'Enable',
+    sourceEvent: 'onActionError',
     ref: {
       targetComponentId: '#editSubmitButton',
       sourceComponentId: '#updateForm',