diff --git a/src/main/java/org/edgegallery/website/config/AuthentionSuccessFilter.java b/src/main/java/org/edgegallery/website/config/AuthentionSuccessFilter.java
index 9b1813cae4f41236a93ff25e7c9dbcd06a53670e..c0166adaf5e5c614b61b1767e7021d3538c15c34 100644
--- a/src/main/java/org/edgegallery/website/config/AuthentionSuccessFilter.java
+++ b/src/main/java/org/edgegallery/website/config/AuthentionSuccessFilter.java
@@ -21,6 +21,7 @@ import org.springframework.security.oauth2.provider.authentication.OAuth2Authent
 public class AuthentionSuccessFilter implements Filter {
     private static final Logger LOGGER = LoggerFactory.getLogger(OAuthClientController.class);
 
+
     @Override
     public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain)
         throws IOException, ServletException {
diff --git a/src/main/java/org/edgegallery/website/config/ClientApplicationContext.java b/src/main/java/org/edgegallery/website/config/ClientApplicationContext.java
index 565b774be58dec6a5625999c74d8296973448386..27c544276ba14e833e22c99ec09b33a4a895e73d 100644
--- a/src/main/java/org/edgegallery/website/config/ClientApplicationContext.java
+++ b/src/main/java/org/edgegallery/website/config/ClientApplicationContext.java
@@ -12,7 +12,7 @@ public class ClientApplicationContext implements ApplicationContextAware {
 
     @Override
     public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
-        this.applicationContext = applicationContext;
+        ClientApplicationContext.applicationContext = applicationContext;
     }
 
     public static <T> T getBean(Class<T> clazz) {
diff --git a/src/main/java/org/edgegallery/website/config/ClientWebSecurityConfigurer.java b/src/main/java/org/edgegallery/website/config/ClientWebSecurityConfigurer.java
index 8bd3103a1328ad6608b2100afa05047171086e7d..7327caf9082f644b60876275d663741399ed9eab 100644
--- a/src/main/java/org/edgegallery/website/config/ClientWebSecurityConfigurer.java
+++ b/src/main/java/org/edgegallery/website/config/ClientWebSecurityConfigurer.java
@@ -50,6 +50,7 @@ import org.springframework.security.oauth2.client.filter.OAuth2ClientAuthenticat
 import org.springframework.security.oauth2.provider.authentication.OAuth2AuthenticationDetails;
 import org.springframework.security.oauth2.provider.token.DefaultTokenServices;
 import org.springframework.security.oauth2.provider.token.TokenStore;
+import org.springframework.security.web.access.ExceptionTranslationFilter;
 import org.springframework.security.web.access.intercept.FilterSecurityInterceptor;
 import org.springframework.security.web.authentication.SimpleUrlAuthenticationSuccessHandler;
 import org.springframework.security.web.authentication.logout.LogoutHandler;
@@ -95,7 +96,7 @@ public class ClientWebSecurityConfigurer extends WebSecurityConfigurerAdapter {
             .antMatchers(HttpMethod.GET, "/mecm-inventory/inventory/v1/mechosts").permitAll()
             .antMatchers(HttpMethod.GET, "/health").permitAll().antMatchers("/webssh").permitAll()
             .antMatchers("/wsserver/**").permitAll().anyRequest().authenticated().and()
-            .addFilterBefore(new AuthentionSuccessFilter(), BasicAuthenticationFilter.class).logout()
+            .addFilterBefore(new AuthentionSuccessFilter(), ExceptionTranslationFilter.class).logout()
             .addLogoutHandler(new LogoutHandler() {
                 @Override
                 public void logout(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse,