diff --git a/ssoauth/views.py b/ssoauth/views.py
index 7ac85472ee002cdf352716de37c0323e82721513..88b7503927c6cc35e985d532a40ab188ee248c6b 100644
--- a/ssoauth/views.py
+++ b/ssoauth/views.py
@@ -160,7 +160,11 @@ class ACSAuthNView(SAMLMixin, View):
         if auth.is_authenticated():
             self.log_in_user(request, auth)
             if conf.settings.DEBUG:
-                request.session["DEBUG_SAML2_ATTRS"] = auth.get_attributes()
+                request.session["DEBUG_SAML2_ATTRS"] = attrs = auth.get_attributes()
+                attrs["SAML2.NameID"] = auth.get_nameid()
+                attrs["SAML2.NameID.Format"] = auth.get_nameid_format()
+                attrs["SAML2.SessionIndex"] = auth.get_session_index()
+                attrs["SAML2.Errors"] = auth.get_errors()
             return http.HttpResponseRedirect(self.get_next_url(request))
         else:
             logger.error("Not authenticated. Errors: {0}".format(auth.get_errors()))