diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/QuickEditModal/EditCompletionModal.vue b/contentcuration/contentcuration/frontend/channelEdit/components/QuickEditModal/EditCompletionModal.vue
index dfb06a150f..f4a9a48b0a 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/QuickEditModal/EditCompletionModal.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/QuickEditModal/EditCompletionModal.vue
@@ -67,6 +67,13 @@
         },
       },
     },
+    watch: {
+      completionObject() {
+        this.$nextTick(() => {
+          this.validate();
+        });
+      },
+    },
     mounted() {
       const { suggested_duration, extra_fields = {} } = this.contentNode;
       const { suggested_duration_type, options } = extra_fields || {};
@@ -133,4 +140,4 @@
 </script>
 
 <style scoped>
-</style>
\ No newline at end of file
+</style>
diff --git a/contentcuration/contentcuration/frontend/shared/views/contentNodeFields/CompletionOptions/index.vue b/contentcuration/contentcuration/frontend/shared/views/contentNodeFields/CompletionOptions/index.vue
index b3a541abbb..d28070b10f 100644
--- a/contentcuration/contentcuration/frontend/shared/views/contentNodeFields/CompletionOptions/index.vue
+++ b/contentcuration/contentcuration/frontend/shared/views/contentNodeFields/CompletionOptions/index.vue
@@ -48,9 +48,9 @@
         v-model="mOfN"
         :showMofN="showMofN"
         :mPlaceholder="getPlaceholder('mOfN.m')"
-        :mRequired="isUnique(mOfN.m)"
+        :mRequired="showMofN && isUnique(mOfN.m)"
         :nPlaceholder="getPlaceholder('mOfN.n')"
-        :nRequired="isUnique(mOfN.n)"
+        :nRequired="showMofN && isUnique(mOfN.n)"
         @mFocus="trackClick('Mastery m value')"
         @nFocus="trackClick('Mastery n value')"
       />