diff --git a/pig-auth/src/main/java/com/pig4cloud/pig/auth/support/core/PigDaoAuthenticationProvider.java b/pig-auth/src/main/java/com/pig4cloud/pig/auth/support/core/PigDaoAuthenticationProvider.java
index 311dee0309edecccce2bdb599fbe535a7972112e..7f0504f8304c05b1f89577383b8e71b0ebbdb27c 100644
--- a/pig-auth/src/main/java/com/pig4cloud/pig/auth/support/core/PigDaoAuthenticationProvider.java
+++ b/pig-auth/src/main/java/com/pig4cloud/pig/auth/support/core/PigDaoAuthenticationProvider.java
@@ -114,7 +114,9 @@ public class PigDaoAuthenticationProvider extends AbstractUserDetailsAuthenticat
 		String clientId = WebUtils.getRequest().get().getParameter(OAuth2ParameterNames.CLIENT_ID);
 
 		if (StrUtil.isBlank(clientId)) {
-			clientId = basicConvert.convert(request).getName();
+			clientId = Optional.ofNullable(basicConvert.convert(request))
+					.map(UsernamePasswordAuthenticationToken::getName)
+					.orElse(null);
 		}
 
 		Map<String, PigUserDetailsService> userDetailsServiceMap = SpringUtil