diff --git a/cas/src/main/java/org/springframework/security/cas/authentication/CasAuthenticationProvider.java b/cas/src/main/java/org/springframework/security/cas/authentication/CasAuthenticationProvider.java
index ceb2fa78a7..c690040ddd 100644
--- a/cas/src/main/java/org/springframework/security/cas/authentication/CasAuthenticationProvider.java
+++ b/cas/src/main/java/org/springframework/security/cas/authentication/CasAuthenticationProvider.java
@@ -195,12 +195,8 @@ public class CasAuthenticationProvider implements AuthenticationProvider, Initia
     }
 
     public boolean supports(final Class<? extends Object> authentication) {
-        if (UsernamePasswordAuthenticationToken.class.isAssignableFrom(authentication)) {
-            return true;
-        } else if (CasAuthenticationToken.class.isAssignableFrom(authentication)) {
-            return true;
-        } else {
-            return false;
-        }
+        return (UsernamePasswordAuthenticationToken.class.isAssignableFrom(authentication)) ||
+           (CasAuthenticationToken.class.isAssignableFrom(authentication)) ||
+           (CasAssertionAuthenticationToken.class.isAssignableFrom(authentication));
     }
 }
diff --git a/cas/src/main/java/org/springframework/security/cas/userdetails/AbstractCasAssertionUserDetailsService.java b/cas/src/main/java/org/springframework/security/cas/userdetails/AbstractCasAssertionUserDetailsService.java
index a0a89e8358..9028dcec74 100644
--- a/cas/src/main/java/org/springframework/security/cas/userdetails/AbstractCasAssertionUserDetailsService.java
+++ b/cas/src/main/java/org/springframework/security/cas/userdetails/AbstractCasAssertionUserDetailsService.java
@@ -18,7 +18,6 @@ import org.springframework.security.core.userdetails.AuthenticationUserDetailsSe
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.springframework.security.core.Authentication;
-import org.springframework.security.cas.authentication.CasAuthenticationToken;
 import org.springframework.security.cas.authentication.CasAssertionAuthenticationToken;
 import org.springframework.util.Assert;
 import org.jasig.cas.client.validation.Assertion;
@@ -34,7 +33,7 @@ import org.jasig.cas.client.validation.Assertion;
 public abstract class AbstractCasAssertionUserDetailsService implements AuthenticationUserDetailsService {
 
     public final UserDetails loadUserDetails(final Authentication token) throws UsernameNotFoundException {
-        Assert.isInstanceOf(CasAuthenticationToken.class, token, "The provided token MUST be an instance of CasAuthenticationToken.class");
+        Assert.isInstanceOf(CasAssertionAuthenticationToken.class, token, "The provided token MUST be an instance of CasAssertionAuthenticationToken.class");
         return loadUserDetails(((CasAssertionAuthenticationToken) token).getAssertion());
     }