diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/account/UaaResetPasswordService.java b/server/src/main/java/org/cloudfoundry/identity/uaa/account/UaaResetPasswordService.java
index fcb60579871..312d3ab0506 100644
--- a/server/src/main/java/org/cloudfoundry/identity/uaa/account/UaaResetPasswordService.java
+++ b/server/src/main/java/org/cloudfoundry/identity/uaa/account/UaaResetPasswordService.java
@@ -27,6 +27,7 @@
 import org.springframework.core.io.support.ResourcePropertySource;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.stereotype.Service;
 import org.cloudfoundry.identity.uaa.oauth.provider.ClientDetails;
 
 import java.sql.Timestamp;
@@ -39,6 +40,7 @@
 import static org.springframework.http.HttpStatus.UNPROCESSABLE_ENTITY;
 import static org.springframework.util.StringUtils.isEmpty;
 
+@Service("resetPasswordService")
 public class UaaResetPasswordService implements ResetPasswordService, ApplicationEventPublisherAware {
 
     public static final int PASSWORD_RESET_LIFETIME = 30 * 60 * 1000;
diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/login/ForcePasswordChangeController.java b/server/src/main/java/org/cloudfoundry/identity/uaa/login/ForcePasswordChangeController.java
index fc7d1348bac..7ef6f81e19f 100644
--- a/server/src/main/java/org/cloudfoundry/identity/uaa/login/ForcePasswordChangeController.java
+++ b/server/src/main/java/org/cloudfoundry/identity/uaa/login/ForcePasswordChangeController.java
@@ -35,7 +35,7 @@ public class ForcePasswordChangeController {
 
     public ForcePasswordChangeController(
             final ResourcePropertySource resourcePropertySource,
-            final @Qualifier("resetPasswordService") ResetPasswordService resetPasswordService) {
+            ResetPasswordService resetPasswordService) {
         this.resourcePropertySource = resourcePropertySource;
         this.resetPasswordService = resetPasswordService;
     }
diff --git a/server/src/main/resources/spring/login-ui.xml b/server/src/main/resources/spring/login-ui.xml
index 3e0faa51f89..a913e530bae 100644
--- a/server/src/main/resources/spring/login-ui.xml
+++ b/server/src/main/resources/spring/login-ui.xml
@@ -372,14 +372,6 @@
         <constructor-arg value="messages.properties"/>
     </bean>
 
-    <bean id="resetPasswordService" class="org.cloudfoundry.identity.uaa.account.UaaResetPasswordService">
-        <constructor-arg ref="scimUserProvisioning"/>
-        <constructor-arg ref="codeStore"/>
-        <constructor-arg ref="uaaPasswordValidator"/>
-        <constructor-arg ref="jdbcClientDetailsService"/>
-        <constructor-arg ref="messagePropertiesSource"/>
-    </bean>
-
     <bean id="activeKeyService" class="org.cloudfoundry.identity.uaa.cypto.EncryptionKeyService"/>
 
     <bean id="encryptionService" class="org.cloudfoundry.identity.uaa.cypto.EncryptionService">