diff --git a/ccm-core/src/com/arsdigita/kernel/security/SamlLoginModule.java b/ccm-core/src/com/arsdigita/kernel/security/SamlLoginModule.java
index f8420d007..bd0e12ca0 100644
--- a/ccm-core/src/com/arsdigita/kernel/security/SamlLoginModule.java
+++ b/ccm-core/src/com/arsdigita/kernel/security/SamlLoginModule.java
@@ -87,6 +87,10 @@ public class SamlLoginModule implements LoginModule {
 
     @Override
     public boolean commit() throws LoginException {
+
+        if (userId != null) {
+            subject.getPrincipals().add(new PartyPrincipal(userId));
+        }
         return true;
     }
 
@@ -97,6 +101,11 @@ public class SamlLoginModule implements LoginModule {
 
     @Override
     public boolean logout() throws LoginException {
+
+        getRequest().getSession().invalidate();
+        return true;
+    }
+
     protected HttpServletRequest getRequest() throws LoginException {
 
         try {