diff --git a/js/components/forms/details_of_use.js b/js/components/forms/details_of_use.js
index 94b0f5f0..edc9cacf 100644
--- a/js/components/forms/details_of_use.js
+++ b/js/components/forms/details_of_use.js
@@ -37,6 +37,9 @@ export default {
       const monthlySpend = this.estimated_monthly_spend || 0
       return monthlySpend * 12
     },
+    jediMigrationOptionSelected: function () {
+      return this.jedi_migration !== ''
+    },
     isJediMigration: function () {
       return this.jedi_migration === 'yes'
     }
diff --git a/templates/requests/screen-1.html b/templates/requests/screen-1.html
index d0acf98d..23f078ab 100644
--- a/templates/requests/screen-1.html
+++ b/templates/requests/screen-1.html
@@ -17,7 +17,7 @@
   ) }}
 {% endif %}
 
-<details-of-use inline-template v-bind:initial-data='{{ f.data }}'>
+<details-of-use inline-template v-bind:initial-data='{{ f.data|tojson }}'>
   <div>
 
     <p>We’d like to know a little about how you plan to use JEDI Cloud services to process your request. Please answer the following questions to the best of your ability. Note that the CCPO does not directly help with migrating systems to JEDI Cloud. These questions are for learning about your cloud readiness and financial usage of the JEDI Cloud; your estimates will not be used for any department level reporting.</p>
@@ -30,14 +30,18 @@
     <h2>Cloud Readiness</h2>
     {{ TextInput(f.num_software_systems, validation='integer') }}
     {{ OptionsInput(f.jedi_migration) }}
-    <template v-if='isJediMigration' v-cloak>
-      {{ OptionsInput(f.rationalization_software_systems) }}
-      {{ OptionsInput(f.technical_support_team) }}
-      {{ OptionsInput(f.organization_providing_assistance) }}
-      {{ OptionsInput(f.engineering_assessment) }}
-      {{ OptionsInput(f.data_transfers) }}
-      {{ OptionsInput(f.expected_completion_date) }}
-      {{ OptionsInput(f.cloud_native) }}
+    <template v-if="jediMigrationOptionSelected">
+      <template v-if='isJediMigration' v-cloak>
+        {{ OptionsInput(f.rationalization_software_systems) }}
+        {{ OptionsInput(f.technical_support_team) }}
+        {{ OptionsInput(f.organization_providing_assistance) }}
+        {{ OptionsInput(f.engineering_assessment) }}
+        {{ OptionsInput(f.data_transfers) }}
+        {{ OptionsInput(f.expected_completion_date) }}
+      </template>
+      <template v-else-if='!isJediMigration' v-cloak>
+        {{ OptionsInput(f.cloud_native) }}
+      </template>
     </template>
 
     <h2>Financial Usage</h2>