diff --git a/src/main/java/com/oguerreiro/resilient/security/saml2/Saml2AuthenticationHandler.java b/src/main/java/com/oguerreiro/resilient/security/saml2/Saml2AuthenticationHandler.java
index 3d2b3db..dcdc5d6 100644
--- a/src/main/java/com/oguerreiro/resilient/security/saml2/Saml2AuthenticationHandler.java
+++ b/src/main/java/com/oguerreiro/resilient/security/saml2/Saml2AuthenticationHandler.java
@@ -82,7 +82,7 @@ public class Saml2AuthenticationHandler implements AuthenticationSuccessHandler,
       return;
     }
 
-    User user = userRepository.findOneByLogin(username).orElse(null);
+    User user = userRepository.findOneWithAuthoritiesByLogin(username).orElse(null);
     if (user != null) {
       // This user can login with SAML2 ?
       if (!user.getAllowSamlAuthentication()) {
@@ -159,7 +159,7 @@ public class Saml2AuthenticationHandler implements AuthenticationSuccessHandler,
         userOrganization, "pt-PT");
 
     Saml2Authentication newAuthentication = new Saml2Authentication(userdetails, samlXMLResponse,
-        authentication.getAuthorities());
+        userdetails.getAuthorities());
     SecurityContextHolder.getContext().setAuthentication(newAuthentication);
 
     // This is a sugar-code when in development environment.