diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/client/service/AppuserClientMapperReadServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/client/service/AppuserClientMapperReadServiceImpl.java
index 6f53e0697..d89168ace 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/client/service/AppuserClientMapperReadServiceImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/client/service/AppuserClientMapperReadServiceImpl.java
@@ -18,25 +18,18 @@
  */
 package org.apache.fineract.portfolio.self.client.service;
 
+import lombok.RequiredArgsConstructor;
 import org.apache.fineract.infrastructure.security.service.PlatformSecurityContext;
 import org.apache.fineract.portfolio.client.exception.ClientNotFoundException;
 import org.apache.fineract.useradministration.domain.AppUser;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.stereotype.Service;
 
-@Service
+@RequiredArgsConstructor
 public class AppuserClientMapperReadServiceImpl implements AppuserClientMapperReadService {
 
     private final JdbcTemplate jdbcTemplate;
     private final PlatformSecurityContext context;
 
-    @Autowired
-    public AppuserClientMapperReadServiceImpl(final JdbcTemplate jdbcTemplate, final PlatformSecurityContext context) {
-        this.jdbcTemplate = jdbcTemplate;
-        this.context = context;
-    }
-
     @Override
     public Boolean isClientMappedToUser(Long clientId, Long appUserId) {
         return this.jdbcTemplate.queryForObject(
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/client/starter/SelfClientConfiguration.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/client/starter/SelfClientConfiguration.java
new file mode 100644
index 000000000..358afa7aa
--- /dev/null
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/client/starter/SelfClientConfiguration.java
@@ -0,0 +1,38 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.self.client.starter;
+
+import org.apache.fineract.infrastructure.security.service.PlatformSecurityContext;
+import org.apache.fineract.portfolio.self.client.service.AppuserClientMapperReadService;
+import org.apache.fineract.portfolio.self.client.service.AppuserClientMapperReadServiceImpl;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.jdbc.core.JdbcTemplate;
+
+@Configuration
+public class SelfClientConfiguration {
+
+    @Bean
+    @ConditionalOnMissingBean(AppuserClientMapperReadService.class)
+    public AppuserClientMapperReadService appuserClientMapperReadService(JdbcTemplate jdbcTemplate, PlatformSecurityContext context) {
+        return new AppuserClientMapperReadServiceImpl(jdbcTemplate, context);
+    }
+
+}