diff --git a/edivorce/apps/core/templates/dashboard/final_filing.html b/edivorce/apps/core/templates/dashboard/final_filing.html
index bb9f06a7..cb2cb681 100644
--- a/edivorce/apps/core/templates/dashboard/final_filing.html
+++ b/edivorce/apps/core/templates/dashboard/final_filing.html
@@ -178,11 +178,14 @@
                     <p>
                         You have indicated that you will file at the following court registry:
                     </p>
+                    {% if court_registry_for_filing %}
                     <ul class="no-bullets">
-                        <li>{{ court_registry_for_filing }}</li>
-                        <li>{{ court_registry_for_filing_address }}</li>
-                        <li>{{ court_registry_for_filing_postal_code }}</li>
+                        <li>{{ court_registry_for_filing }} Law Courts</li>
+                        <li>{{ court_registry_for_filing_address|safe }}</li>
+                        <li>{{ court_registry_for_filing }}, B.C.</li>
+                        <li>{{ court_registry_for_filing_postal_code|safe }}</li>
                     </ul>
+                    {% endif %}
                     <p>
                         Once filed, you will receive a {% include "partials/tooltips/court_file_number.html" %}.
                         This number will be used if you need to file any additional documents.
@@ -245,9 +248,10 @@
                     </p>
                     <ul class="no-bullets">
                         {% if court_registry_for_filing %}
-                            <li>{{ court_registry_for_filing }}</li>
-                            <li>{{ court_registry_for_filing_address }}</li>
-                            <li>{{ court_registry_for_filing_postal_code }}</li>
+                            <li>{{ court_registry_for_filing }} Law Courts</li>
+                            <li>{{ court_registry_for_filing_address|safe }}</li>
+                            <li>{{ court_registry_for_filing }}, B.C.</li>
+                            <li>{{ court_registry_for_filing_postal_code|safe }}</li>
                         {% else %}
                             <p class="error-text">
                                 Go back to the questionnaire to choose a
diff --git a/edivorce/apps/core/tests/test_efiling_court_locations.py b/edivorce/apps/core/tests/test_efiling_court_locations.py
index 592e15cb..426db43f 100644
--- a/edivorce/apps/core/tests/test_efiling_court_locations.py
+++ b/edivorce/apps/core/tests/test_efiling_court_locations.py
@@ -5,24 +5,23 @@ from django.contrib.sessions.middleware import SessionMiddleware
 from django.test import TransactionTestCase
 from django.test.client import RequestFactory
 
-
 from edivorce.apps.core.utils.efiling_court_locations import EFilingCourtLocations
 
 SAMPLE_COURTS_RESPONSE = {"courts": [{
     "id": 19227.0734,
     "identifierCode": "5871",
     "name": "100 Mile House Law Courts",
-            "code": "OMH",
-            "isSupremeCourt": False,
-            "address": {
-                "addressLine1": "160 Cedar Avenue South",
-                "addressLine2": "Box 1060",
-                "addressLine3": None,
-                "postalCode": "V0K2E0",
-                "cityName": "100 Mile House",
-                "provinceName": "British Columbia",
-                "countryName": "Canada"
-            }
+    "code": "OMH",
+    "isSupremeCourt": False,
+    "address": {
+        "addressLine1": "160 Cedar Avenue South",
+        "addressLine2": "Box 1060",
+        "addressLine3": None,
+        "postalCode": "V0K2E0",
+        "cityName": "100 Mile House",
+        "provinceName": "British Columbia",
+        "countryName": "Canada"
+    }
 }]}
 
 
diff --git a/edivorce/apps/core/views/main.py b/edivorce/apps/core/views/main.py
index 12439a69..5e159c46 100644
--- a/edivorce/apps/core/views/main.py
+++ b/edivorce/apps/core/views/main.py
@@ -165,7 +165,7 @@ def dashboard_nav(request, nav_step):
     responses_dict['active_page'] = nav_step
     template_name = 'dashboard/%s.html' % nav_step
     if nav_step in ('print_form', 'swear_forms', 'next_steps', 'final_filing') and responses_dict.get('court_registry_for_filing'):
-        _add_court_registry_address(responses_dict)
+        _add_court_registry_address(request, responses_dict)
     if nav_step in ('print_form', 'initial_filing', 'final_filing'):
         _add_question_errors(responses_dict)
     if nav_step in ('initial_filing', 'final_filing'):
@@ -176,9 +176,33 @@ def dashboard_nav(request, nav_step):
     return render(request, template_name=template_name, context=responses_dict)
 
 
-def _add_court_registry_address(responses_dict):
-    responses_dict['court_registry_for_filing_address'] = f"123 {responses_dict.get('court_registry_for_filing')} St"
-    responses_dict['court_registry_for_filing_postal_code'] = 'V0A 1A1'
+def _add_court_registry_address(request, responses_dict):
+
+    filing_registry = responses_dict.get('court_registry_for_filing', '')
+
+    if not filing_registry:
+        return
+
+    locations = EFilingCourtLocations().courts(request)
+
+    if not filing_registry in locations.keys():
+        return
+
+    location = locations[filing_registry]
+
+    def addr(key):
+        val = location.get(key, '')
+        strVal = '' if val is None else str(val)
+        return strVal + "<br>" if strVal else ''
+
+    address = addr('address_1') + addr('address_2') + addr('address_3')
+    responses_dict['court_registry_for_filing_address'] = address.strip()
+    postal = addr('postal')
+    if len(postal) >= 10:
+        postal = postal[0:3] + ' ' + postal[-7:]
+        responses_dict['court_registry_for_filing_postal_code'] = postal
+    else:
+        responses_dict['court_registry_for_filing_postal_code'] = postal
 
 
 def _add_question_errors(responses_dict):