diff --git a/client/components/open/forms/components/form-components/components/FormNotificationsMessageActions.vue b/client/components/open/forms/components/form-components/components/FormNotificationsMessageActions.vue
index 1b9ac5c..bc71c62 100644
--- a/client/components/open/forms/components/form-components/components/FormNotificationsMessageActions.vue
+++ b/client/components/open/forms/components/form-components/components/FormNotificationsMessageActions.vue
@@ -26,11 +26,11 @@ export default {
   name: 'FormNotificationsMessageActions',
   components: { },
   props: {
-    value: { required: false }
+    modelValue: { required: false }
   },
   data () {
     return {
-      content: this.value ?? {}
+      content: this.modelValue ?? {}
     }
   },
 
@@ -46,7 +46,11 @@ export default {
     }
   },
 
-  watch: {},
+  watch: {
+    modelValue (val) {
+      this.content = val
+    }
+  },
 
   created () {
     if(this.compVal === undefined || this.compVal === null){
diff --git a/client/components/open/forms/components/form-logic-components/ConditionEditor.client.vue b/client/components/open/forms/components/form-logic-components/ConditionEditor.client.vue
index 89b4c51..7616f55 100644
--- a/client/components/open/forms/components/form-logic-components/ConditionEditor.client.vue
+++ b/client/components/open/forms/components/form-logic-components/ConditionEditor.client.vue
@@ -47,12 +47,12 @@ export default {
 
   props: {
     form: { type: Object, required: true },
-    value: { required: false }
+    modelValue: { required: false }
   },
 
   data () {
     return {
-      query: this.value
+      query: this.modelValue
     }
   },
 
@@ -106,8 +106,8 @@ export default {
   },
 
   watch: {
-    value () {
-      this.query = this.value
+    modelValue () {
+      this.query = this.modelValue
     }
   },