diff --git a/js/mixins/form.js b/js/mixins/form.js
index 01f2f24f..ddb33607 100644
--- a/js/mixins/form.js
+++ b/js/mixins/form.js
@@ -44,6 +44,18 @@ export default {
     },
   },
 
+  computed: {
+    canSave: function() {
+      if (!this.invalid) {
+        return true
+      } else if (this.changed && !this.invalid) {
+        return true
+      } else {
+        return false
+      }
+    },
+  },
+
   data: function() {
     return {
       changed: this.hasChanges,
diff --git a/templates/task_orders/builder_base.html b/templates/task_orders/builder_base.html
index e99aef9b..14c3eaa4 100644
--- a/templates/task_orders/builder_base.html
+++ b/templates/task_orders/builder_base.html
@@ -13,7 +13,7 @@
             <input
               type="submit"
               tabindex="0"
-              :disabled="!changed"
+              :disabled="!canSave"
               value="{{ next_button_text }}"
               form="to_form"
               class="usa-button usa-button-primary">