diff --git a/mandaye/auth/saml2.py b/mandaye/auth/saml2.py
index 1a1a435..2f0880c 100644
--- a/mandaye/auth/saml2.py
+++ b/mandaye/auth/saml2.py
@@ -270,7 +270,13 @@ class SAML2Auth(AuthForm):
         env['beaker.session']['validated'] = True
         attributes = saml2utils.get_attributes_from_assertion(login.assertion,
             logger)
-        env['beaker.session']['attributes'] = attributes
+        clean_attributes = dict()
+        for k, v in attributes.iteritems():
+            if len(k) > 1:
+                clean_attributes[k[0]] = v
+            else:
+                clean_attributes[k] = v
+        env['beaker.session']['attributes'] = clean_attributes
         env['beaker.session']['unique_id'] = login.nameIdentifier.content
         env['beaker.session']['liberty_session'] = login.session.dump()
         env['beaker.session'].save()