diff --git a/edivorce/apps/core/views/efiling.py b/edivorce/apps/core/views/efiling.py
index fe979ed8..fc4eb044 100644
--- a/edivorce/apps/core/views/efiling.py
+++ b/edivorce/apps/core/views/efiling.py
@@ -31,11 +31,8 @@ def _submit_files(request, initial=False):
     """ App flow logic """
     responses_dict = get_data_for_user(request.user)
 
-    return_val = _validate_and_submit_documents(request, responses_dict, initial=initial)
-    # Inelegant way to handle eFiling enabled flag. If one value was returned, it's a redirect.
-    if not isinstance(return_val, tuple):
-        return return_val
-    errors, hub_redirect_url = return_val
+    errors, hub_redirect_url = _validate_and_submit_documents(
+        request, responses_dict, initial=initial)
 
     if hub_redirect_url:
         return redirect(hub_redirect_url)
@@ -83,7 +80,8 @@ def _validate_and_submit_documents(request, responses, initial=False):
         return errors, None
 
     if not settings.EFILING_HUB_ENABLED:
-        return _after_submit_files(request, initial)
+        redirect = _after_submit_files(request, initial)
+        return None, redirect.url
 
     msg, redirect_url = _package_and_submit(request, uploaded, generated, responses, initial)
 
diff --git a/edivorce/settings/openshift.py b/edivorce/settings/openshift.py
index 3e680e94..03bd3287 100644
--- a/edivorce/settings/openshift.py
+++ b/edivorce/settings/openshift.py
@@ -145,7 +145,7 @@ REDIS_PASSWORD = os.getenv('REDIS_PASSWORD', '')
 LOGIN_REDIRECT_URL = PROXY_URL_PREFIX + '/signin'
 
 # Enable Efiling Hub
-EFILING_HUB_ENABLED = False
+EFILING_HUB_ENABLED = True
 
 def monkey_absolutify(request, path):
     return PROXY_BASE_URL + path