diff --git a/edivorce/apps/core/templates/pdf/form38.html b/edivorce/apps/core/templates/pdf/form38.html
index f90e689d..f7da0a73 100644
--- a/edivorce/apps/core/templates/pdf/form38.html
+++ b/edivorce/apps/core/templates/pdf/form38.html
@@ -69,21 +69,17 @@
             {% else %}<span class="form-entry not-complete"></span>{% endif %},
             of
 
-            {% if responses.address_to_send_official_document_street_claimant and responses.address_to_send_official_document_city_claimant %}
-                {% required responses.address_to_send_official_document_street_claimant %},
-                {% required responses.address_to_send_official_document_city_claimant size=100 %},
-                {% if responses.address_to_send_official_document_prov_claimant %}
-                    {{ responses.address_to_send_official_document_prov_claimant }},
-                {% endif %}
-                {% if responses.address_to_send_official_document_country_claimant == 'Other' %}
-                    {% required responses.address_to_send_official_document_other_country_claimant size=100 %}
-                {% else %}
-                    {% required responses.address_to_send_official_document_country_claimant size=100 %}
-                {% endif %},
-                {% required responses.address_to_send_official_document_postal_code_claimant size=80 %},
+            {% required responses.address_to_send_official_document_street_claimant trail=',' %}
+            {% required responses.address_to_send_official_document_city_claimant size=100 trail=',' %}
+            {% if responses.address_to_send_official_document_prov_claimant %}
+                {{ responses.address_to_send_official_document_prov_claimant }},
+            {% endif %}
+            {% if responses.address_to_send_official_document_country_claimant == 'Other' %}
+                {% required responses.address_to_send_official_document_other_country_claimant size=100 trail=',' %}
             {% else %}
-                <span class="form-entry not-complete"></span>,
+                {% required responses.address_to_send_official_document_country_claimant size=100 trail=',' %}
             {% endif %}
+            {% required responses.address_to_send_official_document_postal_code_claimant size=100 trail=',' %}
 
             {% required responses.occupation_claimant %}
             <br />
diff --git a/edivorce/apps/core/templates/pdf/form38_we.html b/edivorce/apps/core/templates/pdf/form38_we.html
index b4eb0cdc..96e12522 100644
--- a/edivorce/apps/core/templates/pdf/form38_we.html
+++ b/edivorce/apps/core/templates/pdf/form38_we.html
@@ -70,19 +70,17 @@
             {% else %}<span class="form-entry not-complete"></span>{% endif %},
             of
 
-            {% if responses.address_to_send_official_document_street_you and responses.address_to_send_official_document_city_you %}
-                {% required responses.address_to_send_official_document_street_you %},
-                {% required responses.address_to_send_official_document_city_you size='100' %},
-                {% if responses.address_to_send_official_document_prov_you %}
-                    {{ responses.address_to_send_official_document_prov_you }},
-                {% endif %}
-                {% if responses.address_to_send_official_document_country_you == 'Other' %}
-                    {% required responses.address_to_send_official_document_other_country_you size='100' %}
-                {% else %}
-                    {% required responses.address_to_send_official_document_country_you size='100' %}
-                {% endif %},
-                {% required responses.address_to_send_official_document_postal_code_you size='80' %},
-            {% else %}<span class="form-entry not-complete"></span>,{% endif %}
+            {% required responses.address_to_send_official_document_street_you trail=',' %}
+            {% required responses.address_to_send_official_document_city_you size=100 trail=',' %}
+            {% if responses.address_to_send_official_document_prov_you %}
+                {{ responses.address_to_send_official_document_prov_you }},
+            {% endif %}
+            {% if responses.address_to_send_official_document_country_you == 'Other' %}
+                {% required responses.address_to_send_official_document_other_country_you size=100 trail=',' %}
+            {% else %}
+                {% required responses.address_to_send_official_document_country_you size=100 trail=',' %}
+            {% endif %}
+            {% required responses.address_to_send_official_document_postal_code_you size=100 trail=',' %}
 
             {% required responses.occupation_you %},<br />
 
@@ -92,19 +90,17 @@
                 {% include "partials/name_with_alias.html" with name=responses.name_spouse use_other_name=responses.any_other_name_spouse other_names=responses.other_name_spouse %}
             {% else %}<span class="form-entry not-complete"></span>{% endif %}, of
 
-            {% if responses.address_to_send_official_document_street_spouse and responses.address_to_send_official_document_city_spouse %}
-                {% required responses.address_to_send_official_document_street_spouse %},
-                {% required responses.address_to_send_official_document_city_spouse size='100' %},
-                {% if responses.address_to_send_official_document_prov_spouse %}
-                    {{ responses.address_to_send_official_document_prov_spouse }},
-                {% endif %}
-                {% if responses.address_to_send_official_document_country_spouse == 'Other' %}
-                    {% required responses.address_to_send_official_document_other_country_spouse size='100' %},
-                {% else %}
-                    {% required responses.address_to_send_official_document_country_spouse size='100' %},
-                {% endif %}
-                {% required responses.address_to_send_official_document_postal_code_spouse size='100' %},
-            {% else %}<span class="form-entry not-complete"></span>,{% endif %}
+            {% required responses.address_to_send_official_document_street_spouse trail=',' %}
+            {% required responses.address_to_send_official_document_city_spouse size=100 trail=',' %}
+            {% if responses.address_to_send_official_document_prov_spouse %}
+                {{ responses.address_to_send_official_document_prov_spouse }},
+            {% endif %}
+            {% if responses.address_to_send_official_document_country_spouse == 'Other' %}
+                {% required responses.address_to_send_official_document_other_country_spouse size=100 trail=',' %}
+            {% else %}
+                {% required responses.address_to_send_official_document_country_spouse size=100 trail=',' %}
+            {% endif %}
+            {% required responses.address_to_send_official_document_postal_code_spouse size=100 trail=',' %}
 
             {% required responses.occupation_spouse %},<br />
             SWEAR (OR AFFIRM) THAT:
diff --git a/edivorce/apps/core/templatetags/format_utils.py b/edivorce/apps/core/templatetags/format_utils.py
index 093214d8..2fc63a27 100644
--- a/edivorce/apps/core/templatetags/format_utils.py
+++ b/edivorce/apps/core/templatetags/format_utils.py
@@ -24,10 +24,10 @@ def date_formatter(value):
     return d.strftime('%d %b %Y')
 
 @register.simple_tag()
-def required(field, size=None):
+def required(field, size=None, trail=''):
     """ Return the required field value or the not-entered span """
 
     if field.strip():
-        return field
+        return '%s%s' % (field, trail)
     style = ('min-width: %spx' % size) if size is not None else ''
     return '<span class="form-entry not-complete" style="%s"></span>' % style