diff --git a/Security/Core/Authentication/Provider/SsoAuthenticationProvider.php b/Security/Core/Authentication/Provider/SsoAuthenticationProvider.php
index 68d7b5b..aaf4fa1 100644
--- a/Security/Core/Authentication/Provider/SsoAuthenticationProvider.php
+++ b/Security/Core/Authentication/Provider/SsoAuthenticationProvider.php
@@ -147,8 +147,8 @@ protected function retrieveUser($username)
         } catch (UsernameNotFoundException $notFound) {
             throw $notFound;
         } catch (\Exception $repositoryProblem) {
-            throw new AuthenticationServiceException($repositoryProblem->getMessage(), $username, 0, $repositoryProblem);
-        }
+        	throw new AuthenticationServiceException($username." : ".$repositoryProblem->getMessage(),0, $repositoryProblem);
+	}
 
         return $user;
     }
diff --git a/Security/Core/Authentication/Token/SsoToken.php b/Security/Core/Authentication/Token/SsoToken.php
index 78d2197..c59f744 100644
--- a/Security/Core/Authentication/Token/SsoToken.php
+++ b/Security/Core/Authentication/Token/SsoToken.php
@@ -85,7 +85,7 @@ public function serialize()
 
     public function unserialize($str)
     {
-        list($this->credentials, $this->provider, $parentStr) = unserialize($str);
+        list($this->credentials, $this->manager, $parentStr) = unserialize($str);
         parent::unserialize($parentStr);
     }
 }