diff --git a/training-front-end/src/components/ValidatedDatepicker.vue b/training-front-end/src/components/ValidatedDatepicker.vue
index 23109837..0ba678aa 100644
--- a/training-front-end/src/components/ValidatedDatepicker.vue
+++ b/training-front-end/src/components/ValidatedDatepicker.vue
@@ -1,5 +1,5 @@
 <script setup>
-  import {computed , reactive} from 'vue'  
+  import {computed , reactive, watch} from 'vue'  
   
   const props = defineProps({
     'modelValue': {
@@ -40,13 +40,26 @@
     const year = user_input.year;
     const month = user_input.month;
     const day = user_input.day;
-    if (year && month && day) {
+    if (year.length == 4 && month && day) {
       const newDate = new Date(`${year}-${month}-${day}`);
       if (!isNaN(newDate)) {
         emit('update:modelValue', newDate);
       } 
     }
   }
+
+  watch(() => props.modelValue, (newValue) => {
+    const newDate = new Date(newValue);
+    if (!isNaN(newDate)) {
+      user_input.day = newDate?.getDate()
+      user_input.month = newDate?.getMonth() + 1 //+1 to convert from 0 index array 
+      user_input.year = newDate?.getFullYear()
+    } else{
+      user_input.day = '';
+      user_input.month = '';
+      user_input.year = '';
+    }
+  });
   
 </script>
 <template>
diff --git a/training/api/email.py b/training/api/email.py
index cc6320e2..fc30440d 100644
--- a/training/api/email.py
+++ b/training/api/email.py
@@ -29,7 +29,7 @@
 <p>Greetings!</p>
 
 <p>
-During the GSA SmartPay Training Forum, you completed the required coursework for the GSA SmartPay Program Certification (GSPC)
+During the GSA SmartPay® Training Forum, you completed the required coursework for the GSA SmartPay Program Certification (GSPC)
  defined by <a href="https://smartpay.gsa.gov/policies-and-audits/smart-bulletins/022/">Smart Bulletin 22</a>.
 </p>
 <p>