diff --git a/starlingx-dashboard/centos/build_srpm.data b/starlingx-dashboard/centos/build_srpm.data
index 546a7e79..9f297da0 100644
--- a/starlingx-dashboard/centos/build_srpm.data
+++ b/starlingx-dashboard/centos/build_srpm.data
@@ -1,2 +1,2 @@
 SRC_DIR="starlingx-dashboard"
-TIS_PATCH_VER=27
+TIS_PATCH_VER=28
diff --git a/starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/local/local_settings.d/_30_stx_local_settings.py b/starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/local/local_settings.d/_30_stx_local_settings.py
index 0eb23693..ca4cd103 100644
--- a/starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/local/local_settings.d/_30_stx_local_settings.py
+++ b/starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/local/local_settings.d/_30_stx_local_settings.py
@@ -60,6 +60,14 @@ try:
 except Exception:
     pass
 
+# Change session and CSRF cookie names to prevent login conflict with
+# containerized horizon.
+# NOTE: These settings break upstream angularJS forms such as the launch
+# instance wizard.  If this plugin is to be used in a standard horizon
+# deployment these settings must be overwritten to their default values.
+CSRF_COOKIE_NAME = 'platformcsrftoken'
+SESSION_COOKIE_NAME = 'platformsessionid'
+
 # check if it is in distributed cloud
 DC_MODE = False
 if distributed_cloud_role and distributed_cloud_role in ['systemcontroller',
diff --git a/starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/static/app/core/fault_management/fm.service.js b/starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/static/app/core/fault_management/fm.service.js
index c9fb68bc..c3eaa07e 100644
--- a/starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/static/app/core/fault_management/fm.service.js
+++ b/starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/static/app/core/fault_management/fm.service.js
@@ -30,10 +30,7 @@
       updateEventSuppression: updateEventSuppression
     };
 
-    var csrf_token = $('input[name=csrfmiddlewaretoken]').val();
-    $http.defaults.headers.post['X-CSRFToken'] = csrf_token;
-    $http.defaults.headers.common['X-CSRFToken'] = csrf_token;
-    $http.defaults.headers.put['X-CSRFToken'] = csrf_token;
+    $http.defaults.xsrfCookieName = 'platformcsrftoken';
 
     return service;