diff --git a/pom.xml b/pom.xml
index 92ae482..76bc40b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,9 +9,8 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>dnet-openaire-users</artifactId>
     <packaging>war</packaging>
-    <version>2.0.3-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
     <scm>
-	    <connection>scm:git:gitea@code-repo.d4science.org:MaDgIK/dnet-openaire-users.git</connection>
 	    <developerConnection>scm:git:gitea@code-repo.d4science.org:MaDgIK/dnet-openaire-users.git</developerConnection>
 	    <url>https://code-repo.d4science.org/MaDgIK/dnet-openaire-users/</url>
 
@@ -25,7 +24,7 @@
         <dependency>
             <groupId>eu.dnetlib</groupId>
             <artifactId>uoa-login-core</artifactId>
-            <version>[1.0.0-SNAPSHOT, 2.0.0)</version>
+            <version>1.0.3</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
diff --git a/src/main/java/eu/dnetlib/openaire/usermanagement/OverviewServlet.java b/src/main/java/eu/dnetlib/openaire/usermanagement/OverviewServlet.java
index 71acb05..3c89631 100644
--- a/src/main/java/eu/dnetlib/openaire/usermanagement/OverviewServlet.java
+++ b/src/main/java/eu/dnetlib/openaire/usermanagement/OverviewServlet.java
@@ -1,7 +1,10 @@
 package eu.dnetlib.openaire.usermanagement;
 
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.web.context.support.SpringBeanAutowiringSupport;
 
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -12,6 +15,12 @@ public class OverviewServlet extends HttpServlet {
     @Value("${client-management.url}")
     private String url;
 
+    public void init(ServletConfig config) throws ServletException {
+        super.init(config);
+        SpringBeanAutowiringSupport.processInjectionBasedOnServletContext(this,
+                config.getServletContext());
+    }
+
     public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException {
         response.sendRedirect(url + "/");
     }
diff --git a/src/main/java/eu/dnetlib/openaire/usermanagement/PersonalTokenServlet.java b/src/main/java/eu/dnetlib/openaire/usermanagement/PersonalTokenServlet.java
index ac48b9e..209dffc 100644
--- a/src/main/java/eu/dnetlib/openaire/usermanagement/PersonalTokenServlet.java
+++ b/src/main/java/eu/dnetlib/openaire/usermanagement/PersonalTokenServlet.java
@@ -1,7 +1,10 @@
 package eu.dnetlib.openaire.usermanagement;
 
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.web.context.support.SpringBeanAutowiringSupport;
 
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -12,6 +15,12 @@ public class PersonalTokenServlet extends HttpServlet {
     @Value("${client-management.url}")
     private String url;
 
+    public void init(ServletConfig config) throws ServletException {
+        super.init(config);
+        SpringBeanAutowiringSupport.processInjectionBasedOnServletContext(this,
+                config.getServletContext());
+    }
+
     public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException {
         response.sendRedirect(url + "/personal-token");
     }
diff --git a/src/main/java/eu/dnetlib/openaire/usermanagement/RegisterServiceServlet.java b/src/main/java/eu/dnetlib/openaire/usermanagement/RegisterServiceServlet.java
index 4ef0dde..23aae6d 100644
--- a/src/main/java/eu/dnetlib/openaire/usermanagement/RegisterServiceServlet.java
+++ b/src/main/java/eu/dnetlib/openaire/usermanagement/RegisterServiceServlet.java
@@ -1,7 +1,10 @@
 package eu.dnetlib.openaire.usermanagement;
 
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.web.context.support.SpringBeanAutowiringSupport;
 
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -13,6 +16,12 @@ public class RegisterServiceServlet extends HttpServlet {
     @Value("${client-management.url}")
     private String url;
 
+    public void init(ServletConfig config) throws ServletException {
+        super.init(config);
+        SpringBeanAutowiringSupport.processInjectionBasedOnServletContext(this,
+                config.getServletContext());
+    }
+
     public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException {
         response.sendRedirect(url + "/apis");
     }
diff --git a/src/main/java/eu/dnetlib/openaire/usermanagement/RegisteredServicesServlet.java b/src/main/java/eu/dnetlib/openaire/usermanagement/RegisteredServicesServlet.java
index e18ddb3..033a589 100644
--- a/src/main/java/eu/dnetlib/openaire/usermanagement/RegisteredServicesServlet.java
+++ b/src/main/java/eu/dnetlib/openaire/usermanagement/RegisteredServicesServlet.java
@@ -1,7 +1,9 @@
 package eu.dnetlib.openaire.usermanagement;
 
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.web.context.support.SpringBeanAutowiringSupport;
 
+import javax.servlet.ServletConfig;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
@@ -13,6 +15,12 @@ public class RegisteredServicesServlet extends HttpServlet {
     @Value("${client-management.url}")
     private String url;
 
+    public void init(ServletConfig config) throws ServletException {
+        super.init(config);
+        SpringBeanAutowiringSupport.processInjectionBasedOnServletContext(this,
+                config.getServletContext());
+    }
+
     public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException {
         response.sendRedirect(url + "/apis");
     }