Move interceptor call from client form