diff --git a/include/lassospkit_saml2.inc.php b/include/lassospkit_saml2.inc.php
index 728bfd5..3989a3f 100644
--- a/include/lassospkit_saml2.inc.php
+++ b/include/lassospkit_saml2.inc.php
@@ -144,5 +144,8 @@ class LassoSPKitSaml2 extends LassoSPKitSAMLCommon {
         LassoSPKitHelper::changeFederation($nidmanagement, 
                     $this->session, 
                     $nidmanagement->request->NewID); 
+        if ($nidmanagement->nameIdentifier) {
+            $this->nameID = LassoSPKitHelper::profileGetNameID($nidmanagement);
+        }
     }
 }
diff --git a/include/lassospkit_saml_common.inc.php b/include/lassospkit_saml_common.inc.php
index c4c07a3..8895886 100644
--- a/include/lassospkit_saml_common.inc.php
+++ b/include/lassospkit_saml_common.inc.php
@@ -20,6 +20,7 @@ class LassoSPKitSAMLCommon {
     var $ret_str = "";
     var $exception = null;
     var $relayState = null;
+    var $nameID = null;
 
     public function __construct(LassoSPKitGenericSession $session) {
         $this->session = $session;
@@ -390,6 +391,9 @@ class LassoSPKitSAMLCommon {
      save them in the federations database. */
     public function saveFederation(LassoProfile $profile) {
 	LassoSPKitHelper::saveFederation($profile, $this->session);
+        if ($profile->nameIdentifier) {
+            $this->nameID = LassoSPKitHelper::prileGetNameID($profile);
+        }
         return 0;
     }
     /** Find a federation using as many hints as possible (maybe the nameid given in the request,