diff --git a/edivorce/apps/core/templates/question/02_claimant.html b/edivorce/apps/core/templates/question/02_claimant.html
index bd917a13..e543f778 100644
--- a/edivorce/apps/core/templates/question/02_claimant.html
+++ b/edivorce/apps/core/templates/question/02_claimant.html
@@ -10,9 +10,9 @@
 
 <h1><small>Step 2:</small>Your Information (Claimant 1)</h1>
 
-<div class="question-well {% if last_name_you_error or first_name_you_error %}error{% endif %}">
+<div class="question-well {% if last_name_you_error or given_name_1_you_error %}error{% endif %}">
     <h3>Please enter your name (as it appears on your marriage certificate or registration of marriage)
-        {% if last_name_you_error or first_name_you_error %}{% include 'partials/required.html' %}{% endif %}</h3>
+        {% if last_name_you_error or given_name_1_you_error %}{% include 'partials/required.html' %}{% endif %}</h3>
     <span class="form-group name-group">
         <p>Last name</p>
         {% input_field type="text" name="last_name_you" class="form-block response-textbox" %}
diff --git a/edivorce/apps/core/templates/question/03_respondent.html b/edivorce/apps/core/templates/question/03_respondent.html
index d61d12e4..fb4b9d84 100644
--- a/edivorce/apps/core/templates/question/03_respondent.html
+++ b/edivorce/apps/core/templates/question/03_respondent.html
@@ -13,9 +13,9 @@
 
 <h2>Your Spouse's Information</h2>
 
-<div class="question-well {% if last_name_spouse_error or first_name_spouse_error %}error{% endif %}">
-    <h3>What is your spouse's name ( enter name as it appears on the marriage certificate or registration of marriage)?
-        {% if last_name_spouse_error or first_name_spouse_error %}{% include 'partials/required.html' %}{% endif %}</h3>
+<div class="question-well {% if last_name_spouse_error or given_name_1_spouse_error %}error{% endif %}">
+    <h3>What is your spouse's name (enter name as it appears on the marriage certificate or registration of marriage)?
+        {% if last_name_spouse_error or given_name_1_spouse_error %}{% include 'partials/required.html' %}{% endif %}</h3>
     <span class="form-group name-group">
         <p>Last name</p>
         {% input_field type="text" name="last_name_spouse" class="form-block response-textbox" %}
diff --git a/edivorce/apps/core/templatetags/format_utils.py b/edivorce/apps/core/templatetags/format_utils.py
index bfed6d34..140718a2 100644
--- a/edivorce/apps/core/templatetags/format_utils.py
+++ b/edivorce/apps/core/templatetags/format_utils.py
@@ -212,21 +212,23 @@ def css_rotate(image):
 @register.filter
 def name_you(responses):
     """ Gets and formats given_name_1_you, given_name_2_you, given_name_3_you, last_name_you from responses """
-    given_name_1 = responses.get('given_name_1_you', '') + ' '
-    given_name_2 = responses.get('given_name_2_you', '') + ' '
-    given_name_3 = responses.get('given_name_3_you', '') + ' '
-    last_name = responses.get('last_name_you', '')
-    return re.sub(' +', ' ', given_name_1 + given_name_2 + given_name_3 + last_name).strip()
+    given_name_1 = responses.get('given_name_1_you')
+    given_name_2 = responses.get('given_name_2_you')
+    given_name_3 = responses.get('given_name_3_you')
+    last_name = responses.get('last_name_you')
+    names = [given_name_1, given_name_2, given_name_3, last_name]
+    return ' '.join(filter(None, names))    
 
 
 @register.filter
 def name_spouse(responses):
     """ Gets and formats given_name_1_spouse, given_name_2_spouse, given_name_3_spouse, last_name_spouse from responses """    
-    given_name_1 = responses.get('given_name_1_spouse', '') + ' '
-    given_name_2 = responses.get('given_name_2_spouse', '') + ' '
-    given_name_3 = responses.get('given_name_3_spouse', '') + ' '
-    last_name = responses.get('last_name_spouse', '')
-    return re.sub(' +', ' ', given_name_1 + given_name_2 + given_name_3 + last_name).strip()
+    given_name_1 = responses.get('given_name_1_spouse')
+    given_name_2 = responses.get('given_name_2_spouse')
+    given_name_3 = responses.get('given_name_3_spouse')
+    last_name = responses.get('last_name_spouse')
+    names = [given_name_1, given_name_2, given_name_3, last_name]
+    return ' '.join(filter(None, names))
 
 
 @register.simple_tag(takes_context=True)