--- AuthenticatorBase.java	(revision 1485197)
+++ AuthenticatorBase.java	(working copy)
@@ -775,6 +775,8 @@ 
             if (principal == null) {
                 // Registering a programmatic logout
                 sso.deregister(ssoId);
+                // Fix for Bug 54999 to ensure JSESSIONIDSSO can be re-created
+                request.removeNote(Constants.REQ_SSOID_NOTE);
                 return;
             } else {
                 // Update the SSO session with the latest authentication data