diff --git a/edivorce/apps/core/templates/question/07_support.html b/edivorce/apps/core/templates/question/07_support.html
index 63c356c3..f888ca60 100644
--- a/edivorce/apps/core/templates/question/07_support.html
+++ b/edivorce/apps/core/templates/question/07_support.html
@@ -11,7 +11,7 @@
 
 <h1><small>Step 6:</small>Spousal Support</h1>
 
-<div class="question-well">
+<div class="question-well {% if spouse_support_details_error %}error{% endif %}">
     <h3>
         {% if name_you %}{{ name_you }}{% else %}Claimant 1{% endif %}
         and {% if name_spouse %}{{ name_spouse }}{% else %}Claimant 2{% endif %}
@@ -22,7 +22,7 @@
               <p>A type of court ruling a judge or master makes that sets out
               what you must do or not do.</p>
               ">order<i class="fa fa-question-circle"  aria-hidden="true"></i></span>
-        for spousal support as follows:
+        for spousal support as follows:{% if spouse_support_details_error %}{% include 'partials/required.html' %}{% endif %}
     </h3>
     {% input_field type="textarea" name="spouse_support_details" rows="8" cols="65" class="response-textarea" placeholder="Please enter the spousal support details that you want to appear in the order issued by the court." %}
     <p>
@@ -151,9 +151,10 @@
 </div>
 
 
-<div class="question-well">
+<div class="question-well {% if spouse_support_act_error %}error{% endif %}">
     {% if married_marriage_like == "Legally married" %}
-        <h3>Please indicate which act you are asking for support under.</h3>
+        <h3>Please indicate which act you are asking for support under.{% if spouse_support_act_error %}{% include 'partials/required.html' %}{% endif %}
+        </h3>
         <div class="radio">
             <label>
                 {% input_field type="radio" name="spouse_support_act" value="The Divorce Act (Canada)" data_target_id="family_law_time_limit" data_reveal_target="false" %}
diff --git a/edivorce/apps/core/utils/question_step_mapping.py b/edivorce/apps/core/utils/question_step_mapping.py
index a1f59778..12f5158d 100644
--- a/edivorce/apps/core/utils/question_step_mapping.py
+++ b/edivorce/apps/core/utils/question_step_mapping.py
@@ -180,7 +180,10 @@ page_step_mapping = {
     'respondent': 'your_spouse',
     'marriage': 'your_marriage',
     'separation': 'your_separation',
+    'support': 'spousal_support',
 }
+
+
 """ List of court registries """
 list_of_registries = ['Fort St. John', 'Dawson Creek', 'Prince Rupert',
                       'Terrace', 'Smithers', 'Prince George', 'Quesnel',