diff --git a/edivorce/apps/core/static/js/main.js b/edivorce/apps/core/static/js/main.js
index fa8cbce0..f9ed0cc7 100755
--- a/edivorce/apps/core/static/js/main.js
+++ b/edivorce/apps/core/static/js/main.js
@@ -52,6 +52,14 @@ $(function () {
 
     $("input[type=radio], input[type=checkbox], input[type=text], .response-textarea, .response-dropdown").on("change", ajaxOnChange);
 
+    // If relationship is common law and they want spousal support, update spouse_support_act with hidden input field, spouse_support_act_common_law
+    if ($("#spouse_support_act_common_law").length) {
+        var el = $("#spouse_support_act_common_law");
+        var question = el.prop('name');
+        var value = getValue(el, question);
+        ajaxCall(question, value);
+    }
+
     // Add name button adds new input field for adding other name
     $("#btn_add_other_names").on('click', function () {
         $('#other_names_fields').append($('#other_names_group').children().clone(true));
diff --git a/edivorce/apps/core/templates/question/06_support.html b/edivorce/apps/core/templates/question/06_support.html
index 8f6d7a6b..74bd9919 100644
--- a/edivorce/apps/core/templates/question/06_support.html
+++ b/edivorce/apps/core/templates/question/06_support.html
@@ -104,39 +104,59 @@
 
 
 <div class="question-well">
-    <h3>Please indicate which act you are asking for support under.</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" %}The Divorce Act (Canada)</label> - <a href="http://laws-lois.justice.gc.ca/eng/acts/D-3.4/index.html" target="_blank">view the Divorce Act</a></div>
-    <div class="radio"><label>{% input_field type="radio" name="spouse_support_act" value="The Family Law Act" data_target_id="family_law_time_limit" data_reveal_target="true" %}The Family Law Act</label> - <a href="http://www.bclaws.ca/civix/document/id/complete/statreg/11025_01" target="_blank">view the Family Law Act</a></div>
+    {% if married_marriage_like == "Legally married" %}
+        <h3>Please indicate which act you are asking for support under.</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" %}The Divorce Act (Canada)</label> - <a href="http://laws-lois.justice.gc.ca/eng/acts/D-3.4/index.html" target="_blank">view the Divorce Act</a></div>
+        <div class="radio"><label>{% input_field type="radio" name="spouse_support_act" value="The Family Law Act" data_target_id="family_law_time_limit" data_reveal_target="true" %}The Family Law Act</label> - <a href="http://www.bclaws.ca/civix/document/id/complete/statreg/11025_01" target="_blank">view the Family Law Act</a></div>
 
-    <div class="information-message bg-danger" id="family_law_time_limit" hidden>
-        <h2>Time limit to apply for court order</h2>
-        <p><b>Legally married</b><br />
-        If you were married, you must apply for spousal support under the Family Law Act <b>within two years after you get an order for divorce</b>. If you are applying for spousal support under the Divorce Act, you do not have a time limit.</p>
-
-        <p><b>Not married (common law)</b><br />
-        If you were unmarried, and you qualify for spousal support, you must apply <b>within two years of the date you separated</b>.</p>
-    </div>
-
-    <div class="collapse-trigger collapsed" data-toggle="collapse" aria-expanded="false" data-target="#collapse_support_act" aria-controls="collapse_support_act">
-        <div>
-            How do I know which act applies to my situation?
-        </div>
-    </div>
-    <div class="collapse" id="collapse_support_act">
-        <div>
-            <p>Ok, you may be thinking, how the heck am I supposed to know which act (a written law) applies. Let's see if we can help you identify which act best fits with your circumstances/situation.</p>
-            <p><b>If you are not married (common law) >  Family Law Act</b><br/>
-                If you were never married, you must use the Family Law Act. Provincial and territorial laws apply when unmarried couples separate or when married couples separate but do not pursue a divorce
-            </p>
-            <p><b>If you are Married > Family Law Act or Divorce Act</b><br/>
-                If you're married, you have a choice.The federal Divorce Act generally applies when parents are divorcing. Provincial and territorial laws apply when married couples separate but do not pursue a divorce
-            </p>
+        <div class="information-message bg-danger" id="family_law_time_limit" hidden>
+            <h2>Time limit to apply for court order</h2>
             <p>
-                For more  information on
-                <a href="http://www.familylaw.lss.bc.ca/resources/fact_sheets/what_laws_apply.php" target="_blank">which laws apply</a> to your situation please refer to the Family Law of B.C. website.
+                If you were married, you must apply for spousal support under the Family Law Act <b>within two years after you get an order for divorce.</b>
+                If you are applying for spousal support under the Divorce Act, you do not have a time limit.
             </p>
         </div>
-    </div>
+
+        <div class="collapse-trigger collapsed" data-toggle="collapse" aria-expanded="false" data-target="#collapse_support_act" aria-controls="collapse_support_act">
+            <div>
+                How do I know which act applies to my situation?
+            </div>
+        </div>
+        <div class="collapse" id="collapse_support_act">
+            <div>
+                <p>Ok, you may be thinking, how the heck am I supposed to know which act (a written law) applies. Let's see if we can help you identify which act best fits with your circumstances/situation.</p>
+                <p><b>If you are not married (common law) >  Family Law Act</b><br/>
+                    If you were never married, you must use the Family Law Act. Provincial and territorial laws apply when unmarried couples separate or when married couples separate but do not pursue a divorce
+                </p>
+                <p><b>If you are Married > Family Law Act or Divorce Act</b><br/>
+                    If you're married, you have a choice.The federal Divorce Act generally applies when parents are divorcing. Provincial and territorial laws apply when married couples separate but do not pursue a divorce
+                </p>
+                <p>
+                    For more  information on
+                    <a href="http://www.familylaw.lss.bc.ca/resources/fact_sheets/what_laws_apply.php" target="_blank">which laws apply</a> to your situation please refer to the Family Law of B.C. website.
+                </p>
+            </div>
+        </div>
+    {% else %}
+        <div class="common-law-support">
+            <div>
+                {% input_field type="hidden" id="spouse_support_act_common_law" name="spouse_support_act" value="The Family Law Act" %}
+                <p>
+                    As you and your spouse were never legally married, you must use the
+                    <a href="http://www.bclaws.ca/civix/document/id/complete/statreg/11025_01" target="_blank">Family Law Act</a>
+                    for your separation. Provincial and territorial laws apply when unmarried couples separate or when married couples separate but do not pursue a divorce.
+                </p>
+                <p>
+                    For more information on <a href="http://www.familylaw.lss.bc.ca/resources/fact_sheets/what_laws_apply.php" target="_blank">which laws apply</a>
+                    to your situation please refer to the Family Law of B.C. website.
+                </p>
+            </div>
+            <div class="information-message bg-danger">
+                <h2>Time limit to apply for court order</h2>
+                <p>If you were unmarried, and you qualify for spousal support, you must apply <b>within two years of the date you separated</b>.</p>
+            </div>
+        </div>
+    {% endif %}
 </div>