diff --git a/edivorce/apps/core/efilinghub.py b/edivorce/apps/core/efilinghub.py
index ffd9dc20..57e5dce3 100644
--- a/edivorce/apps/core/efilinghub.py
+++ b/edivorce/apps/core/efilinghub.py
@@ -230,16 +230,18 @@ class EFilingHub:
         if parties:
             package['filingPackage']['parties'] = parties
         # update return urls
-        package['navigationUrls']['error'] = request.build_absolute_uri(
-            reverse('dashboard_nav', args=['check_with_registry']))
         if self.initial_filing:
-            package['navigationUrls']['cancel'] = request.build_absolute_uri(
+            package['navigationUrls']['error'] = request.build_absolute_uri(
                 reverse('dashboard_nav', args=['initial_filing']))
+            package['navigationUrls']['cancel'] = request.build_absolute_uri(
+                reverse('dashboard_nav', args=['initial_filing'])) + '?cancelled=1'
             package['navigationUrls']['success'] = request.build_absolute_uri(
                 reverse('after_submit_initial_files'))
         else:
-            package['navigationUrls']['cancel'] = request.build_absolute_uri(
+            package['navigationUrls']['error'] = request.build_absolute_uri(
                 reverse('dashboard_nav', args=['final_filing']))
+            package['navigationUrls']['cancel'] = request.build_absolute_uri(
+                reverse('dashboard_nav', args=['final_filing'])) + '?cancelled=1'
             package['navigationUrls']['success'] = request.build_absolute_uri(
                 reverse('after_submit_final_files'))
 
diff --git a/edivorce/apps/core/utils/cso_filing.py b/edivorce/apps/core/utils/cso_filing.py
index d9bf954c..d540821a 100644
--- a/edivorce/apps/core/utils/cso_filing.py
+++ b/edivorce/apps/core/utils/cso_filing.py
@@ -28,21 +28,19 @@ def file_documents(request, responses, initial=False):
     if errors:
         return errors, None
 
-    if settings.EFILING_HUB_ENABLED:
-        hub = EFilingHub(initial_filing=initial)
+    hub = EFilingHub(initial_filing=initial)
 
-        post_files, documents = hub.get_files(request, responses, uploaded, generated)
-        location = hub.get_location(responses)
-        parties = hub.get_parties(responses)
+    post_files, documents = hub.get_files(request, responses, uploaded, generated)
+    location = hub.get_location(responses)
+    parties = hub.get_parties(responses)
 
-        redirect_url, msg = hub.upload(request, post_files, documents, parties, location)
+    redirect_url, msg = hub.upload(request, post_files, documents, parties, location)
 
-        if redirect_url:
-            return errors, redirect_url
-
-        if msg:
-            return msg, None
+    if redirect_url:
+        return errors, redirect_url
 
+    if msg:
+        return [msg], None
     return None, None
 
 
@@ -51,7 +49,7 @@ def after_file_documents(request, initial=False):
 
     # Save dummy data for now. Eventually replace with data from CSO
     prefix = 'initial' if initial else 'final'
-    _save_response(user, f'{prefix}_filing_submitted', True)
+    _save_response(user, f'{prefix}_filing_submitted', 'True')
 
     if not initial:
         _save_response(user, f'final_filing_status', 'Submitted')
diff --git a/edivorce/apps/core/views/efiling.py b/edivorce/apps/core/views/efiling.py
index b1098e1e..29fa8178 100644
--- a/edivorce/apps/core/views/efiling.py
+++ b/edivorce/apps/core/views/efiling.py
@@ -37,6 +37,8 @@ def _submit_files(request, initial=False):
 
     if errors:
         next_page = original_step
+        if not isinstance(errors, list):
+            errors = [errors]
         for error in errors:
             messages.add_message(request, messages.ERROR, error)
 
diff --git a/edivorce/apps/core/views/main.py b/edivorce/apps/core/views/main.py
index 5970880b..13c1e3f5 100644
--- a/edivorce/apps/core/views/main.py
+++ b/edivorce/apps/core/views/main.py
@@ -191,6 +191,8 @@ def _add_error_messages(nav_step, request, responses_dict):
                              'The connection to the BC Government’s eFiling Hub is currently not working. '
                              'This is a temporary problem. '
                              'Please try again now and if this issue persists try again later.')
+    elif request.GET.get('message'):
+        messages.add_message(request, messages.ERROR, request.GET.get('message'))
 
 
 @login_required
diff --git a/edivorce/settings/base.py b/edivorce/settings/base.py
index 7f3e3309..53ee961e 100644
--- a/edivorce/settings/base.py
+++ b/edivorce/settings/base.py
@@ -185,7 +185,6 @@ DEBUG_TOOLBAR_CONFIG = {
 SECURE_BROWSER_XSS_FILTER = True
 
 # eFiling Hub settings
-EFILING_HUB_ENABLED = False
 EFILING_HUB_TOKEN_BASE_URL = env('EFILING_HUB_TOKEN_BASE_URL', 'https://efiling.gov.bc.ca')
 EFILING_HUB_REALM = env('EFILING_HUB_REALM', 'abc')
 EFILING_HUB_CLIENT_ID = env('EFILING_HUB_CLIENT_ID', 'abc')
diff --git a/edivorce/settings/local.py b/edivorce/settings/local.py
index ed5140a2..99c38713 100644
--- a/edivorce/settings/local.py
+++ b/edivorce/settings/local.py
@@ -49,5 +49,3 @@ OIDC_OP_USER_ENDPOINT = 'http://localhost:8081/auth/realms/justice/protocol/open
 KEYCLOAK_LOGOUT = 'http://localhost:8081/auth/realms/justice/protocol/openid-connect/logout'
 OIDC_RP_CLIENT_ID = 'edivorce-app'
 LOGIN_REDIRECT_URL = '/signin'
-
-EFILING_HUB_ENABLED = True