diff --git a/edivorce/apps/core/middleware/bceid_middleware.py b/edivorce/apps/core/middleware/bceid_middleware.py
index 70ecb334..6e3c0e8b 100644
--- a/edivorce/apps/core/middleware/bceid_middleware.py
+++ b/edivorce/apps/core/middleware/bceid_middleware.py
@@ -18,7 +18,9 @@ class BceidMiddleware(object):
         # make the FORCE_SCRIPT_NAME available in templates
         request.proxy_root_path = settings.FORCE_SCRIPT_NAME
 
-        if settings.DEPLOYMENT_TYPE != 'localdev' and not request.META.get('HTTP_SM_USERDN', False):
+        localdev = settings.DEPLOYMENT_TYPE == 'localdev'
+
+        if not localdev and request.META.get('HTTP_SM_USERDN', '') != '':
 
             # 1. Real BCeID user / logged in
 
@@ -31,7 +33,8 @@ class BceidMiddleware(object):
                 first_name='Bud',
                 last_name='Bundy'
             )
-        elif request.session.get('fake-bceid-guid', False):
+
+        elif localdev and request.session.get('fake-bceid-guid', False):
 
             # 2. Fake BCeID user / logged in
             request.bceid_user = BceidUser(
diff --git a/edivorce/apps/core/views/main.py b/edivorce/apps/core/views/main.py
index 77ddb2d5..0e7b0527 100644
--- a/edivorce/apps/core/views/main.py
+++ b/edivorce/apps/core/views/main.py
@@ -39,8 +39,11 @@ def login(request):
 
 def logout(request):
     request.session.flush()
-    return redirect(settings.FORCE_SCRIPT_NAME[:-1] + '/intro')
 
+    if settings.DEPLOYMENT_TYPE == 'localdev':
+        return redirect(settings.FORCE_SCRIPT_NAME[:-1] + '/intro')
+    else:
+        return redirect(settings.LOGOUT_URL)
 
 def prequalification(request, step):
     """
diff --git a/edivorce/settings/openshift.py b/edivorce/settings/openshift.py
index b0b74a3e..75afe74c 100644
--- a/edivorce/settings/openshift.py
+++ b/edivorce/settings/openshift.py
@@ -68,4 +68,6 @@ FORCE_SCRIPT_NAME = PROXY_URL_PREFIX + '/'
 STATIC_URL = PROXY_URL_PREFIX + '/static/'
 WEASYPRINT_CSS_LOOPBACK += PROXY_URL_PREFIX
 
+LOGOUT_URL = 'https://logon.gov.bc.ca/clp-cgi/logoff.cgi?returl=https://justice.gov.bc.ca%s&retnow=1' % PROXY_URL_PREFIX
+