1 files changed, 3 insertions, 1 deletions
diff --git a/extensions/Persona/template/en/default/hook/global/header-additional_header.html.tmpl b/extensions/Persona/template/en/default/hook/global/header-additional_header.html.tmpl
index 7260fd9a8..fce6aeac5 100644
--- a/extensions/Persona/template/en/default/hook/global/header-additional_header.html.tmpl
+++ b/extensions/Persona/template/en/default/hook/global/header-additional_header.html.tmpl
@@ -58,7 +58,9 @@ function persona_onlogin(assertion) {
 }
 
 navigator.id.watch({
-  loggedInUser: [% IF user.id %]'[% user.login FILTER js %]'[% ELSE %]null[% END %],
+  [%# we can't set loggedInUser to user.login as this causes cgi authenticated
+      sessions to be logged out by persona %]
+  loggedInUser: null,
   onlogin: persona_onlogin,
   onlogout: function () {
     document.location = '[% urlbase FILTER none %]index.cgi?logout=1';