diff --git a/remote-api/src/main/java/org/alfresco/rest/api/People.java b/remote-api/src/main/java/org/alfresco/rest/api/People.java
index ea7af6886c..0b1af59916 100644
--- a/remote-api/src/main/java/org/alfresco/rest/api/People.java
+++ b/remote-api/src/main/java/org/alfresco/rest/api/People.java
@@ -92,6 +92,8 @@ public interface People
     CollectionWithPagingInfo<Person> getPeople(Parameters parameters);
 
     /**
+     * @deprecated from 7.1.0
+     * 
      * Request password reset (an email will be sent to the registered email of the given {@code userId}).
      * The API returns a 202 response for a valid, as well as the invalid (does not exist or disabled) userId
      *
@@ -101,6 +103,8 @@ public interface People
     void requestPasswordReset(String userId, String client);
 
     /**
+     * @deprecated from 7.1.0
+     * 
      * Performs password reset
      *
      * @param passwordReset the password reset details
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/impl/PeopleImpl.java b/remote-api/src/main/java/org/alfresco/rest/api/impl/PeopleImpl.java
index 9d8ea818cc..706e5238dd 100644
--- a/remote-api/src/main/java/org/alfresco/rest/api/impl/PeopleImpl.java
+++ b/remote-api/src/main/java/org/alfresco/rest/api/impl/PeopleImpl.java
@@ -866,6 +866,7 @@ public class PeopleImpl implements People
         return authorityService.isAdminAuthority(authorityName);
     }
 
+    @Deprecated
     @Override
     public void requestPasswordReset(String userId, String client)
     {
@@ -895,6 +896,7 @@ public class PeopleImpl implements People
         });
     }
 
+    @Deprecated
     @Override
     public void resetPassword(String personId, final PasswordReset passwordReset)
     {
diff --git a/remote-api/src/main/java/org/alfresco/rest/api/people/PeopleEntityResource.java b/remote-api/src/main/java/org/alfresco/rest/api/people/PeopleEntityResource.java
index 114098121f..2fb74875b4 100644
--- a/remote-api/src/main/java/org/alfresco/rest/api/people/PeopleEntityResource.java
+++ b/remote-api/src/main/java/org/alfresco/rest/api/people/PeopleEntityResource.java
@@ -163,6 +163,7 @@ public class PeopleEntityResource implements EntityResourceAction.ReadById<Perso
         return people.getPeople(params);
     }
 
+    @Deprecated
     @Operation("request-password-reset")
     @WebApiDescription(title = "Request Password Reset", description = "Request password reset",
                        successStatus = HttpServletResponse.SC_ACCEPTED)
@@ -172,6 +173,7 @@ public class PeopleEntityResource implements EntityResourceAction.ReadById<Perso
         people.requestPasswordReset(personId, client.getClient());
     }
 
+    @Deprecated
     @Operation("reset-password")
     @WebApiDescription(title = "Reset Password", description = "Performs password reset", successStatus = HttpServletResponse.SC_ACCEPTED)
     @WebApiNoAuth
diff --git a/repository/src/main/java/org/alfresco/repo/security/authentication/ResetPasswordService.java b/repository/src/main/java/org/alfresco/repo/security/authentication/ResetPasswordService.java
index d7f1fe3629..b8781b2486 100644
--- a/repository/src/main/java/org/alfresco/repo/security/authentication/ResetPasswordService.java
+++ b/repository/src/main/java/org/alfresco/repo/security/authentication/ResetPasswordService.java
@@ -32,11 +32,13 @@ import org.alfresco.repo.client.config.ClientAppNotFoundException;
 import org.alfresco.repo.security.authentication.ResetPasswordServiceImpl.ResetPasswordDetails;
 
 /**
+ * @deprecated from 7.1.0
  * Reset password service.
  *
  * @author Jamal Kaabi-Mofrad
  * @since 5.2.1
  */
+@Deprecated
 public interface ResetPasswordService
 {
     /**
diff --git a/repository/src/main/java/org/alfresco/repo/security/authentication/ResetPasswordServiceImpl.java b/repository/src/main/java/org/alfresco/repo/security/authentication/ResetPasswordServiceImpl.java
index 2cc19b813c..530002af89 100644
--- a/repository/src/main/java/org/alfresco/repo/security/authentication/ResetPasswordServiceImpl.java
+++ b/repository/src/main/java/org/alfresco/repo/security/authentication/ResetPasswordServiceImpl.java
@@ -74,11 +74,14 @@ import java.util.Locale;
 import java.util.Map;
 
 /**
+ * @deprecated from 7.1.0
+ * *
  * Reset password implementation based on workflow.
  *
  * @author Jamal Kaabi-Mofrad
  * @since 5.2.1
  */
+@Deprecated
 public class ResetPasswordServiceImpl implements ResetPasswordService
 {
     private static final Log LOGGER = LogFactory.getLog(ResetPasswordServiceImpl.class);
diff --git a/repository/src/main/java/org/alfresco/repo/security/authentication/activiti/AbstractResetPasswordDelegate.java b/repository/src/main/java/org/alfresco/repo/security/authentication/activiti/AbstractResetPasswordDelegate.java
index 8028d07526..fce6f7e59a 100644
--- a/repository/src/main/java/org/alfresco/repo/security/authentication/activiti/AbstractResetPasswordDelegate.java
+++ b/repository/src/main/java/org/alfresco/repo/security/authentication/activiti/AbstractResetPasswordDelegate.java
@@ -30,9 +30,12 @@ import org.alfresco.repo.security.authentication.ResetPasswordService;
 import org.alfresco.repo.workflow.activiti.BaseJavaDelegate;
 
 /**
+ * @deprecated from 7.1.0
+ *  
  * @author Jamal Kaabi-Mofrad
  * @since 5.2.1
  */
+@Deprecated
 public abstract class AbstractResetPasswordDelegate extends BaseJavaDelegate
 {
     protected ResetPasswordService resetPasswordService;
diff --git a/repository/src/main/java/org/alfresco/repo/security/authentication/activiti/PerformResetPasswordDelegate.java b/repository/src/main/java/org/alfresco/repo/security/authentication/activiti/PerformResetPasswordDelegate.java
index 0369e2bb16..23522a0044 100644
--- a/repository/src/main/java/org/alfresco/repo/security/authentication/activiti/PerformResetPasswordDelegate.java
+++ b/repository/src/main/java/org/alfresco/repo/security/authentication/activiti/PerformResetPasswordDelegate.java
@@ -30,11 +30,14 @@ import org.activiti.engine.delegate.DelegateExecution;
 import org.activiti.engine.delegate.JavaDelegate;
 
 /**
+ * @deprecated from 7.1.0
+ * 
  * This {@link JavaDelegate activiti delegate} is executed when a user resets his/her password.
  *
  * @author Jamal Kaabi-Mofrad
  * @since 5.2.1
  */
+@Deprecated
 public class PerformResetPasswordDelegate extends AbstractResetPasswordDelegate
 {
     @Override
diff --git a/repository/src/main/java/org/alfresco/repo/security/authentication/activiti/SendResetPasswordConfirmationEmailDelegate.java b/repository/src/main/java/org/alfresco/repo/security/authentication/activiti/SendResetPasswordConfirmationEmailDelegate.java
index 97e9aaeff2..7d063e7950 100644
--- a/repository/src/main/java/org/alfresco/repo/security/authentication/activiti/SendResetPasswordConfirmationEmailDelegate.java
+++ b/repository/src/main/java/org/alfresco/repo/security/authentication/activiti/SendResetPasswordConfirmationEmailDelegate.java
@@ -30,11 +30,14 @@ import org.activiti.engine.delegate.DelegateExecution;
 import org.activiti.engine.delegate.JavaDelegate;
 
 /**
+ * @deprecated from 7.1.0
+ * 
  * This {@link JavaDelegate activiti delegate} is executed when a user is finished resetting his/her password.
  *
  * @author Jamal Kaabi-Mofrad
  * @since 5.2.1
  */
+@Deprecated
 public class SendResetPasswordConfirmationEmailDelegate extends AbstractResetPasswordDelegate
 {
     private static final String EMAIL_SUBJECT_KEY = "reset-password-confirmation.email.subject";
diff --git a/repository/src/main/java/org/alfresco/repo/security/authentication/activiti/SendResetPasswordEmailDelegate.java b/repository/src/main/java/org/alfresco/repo/security/authentication/activiti/SendResetPasswordEmailDelegate.java
index 5948f10e50..9eca17cdc8 100644
--- a/repository/src/main/java/org/alfresco/repo/security/authentication/activiti/SendResetPasswordEmailDelegate.java
+++ b/repository/src/main/java/org/alfresco/repo/security/authentication/activiti/SendResetPasswordEmailDelegate.java
@@ -29,12 +29,15 @@ package org.alfresco.repo.security.authentication.activiti;
 import org.activiti.engine.delegate.DelegateExecution;
 import org.activiti.engine.delegate.JavaDelegate;
 
-/**
+/** 
+ * @deprecated from 7.1.0
+ * 
  * This {@link JavaDelegate activiti delegate} is executed when a user request password reset.
  *
  * @author Jamal Kaabi-Mofrad
  * @since 5.2.1
  */
+@Deprecated
 public class SendResetPasswordEmailDelegate extends AbstractResetPasswordDelegate
 {
     private static final String EMAIL_SUBJECT_KEY = "reset-password-request.email.subject";
diff --git a/repository/src/main/java/org/alfresco/repo/workflow/WorkflowModelResetPassword.java b/repository/src/main/java/org/alfresco/repo/workflow/WorkflowModelResetPassword.java
index c2795b06f0..c44017ab38 100644
--- a/repository/src/main/java/org/alfresco/repo/workflow/WorkflowModelResetPassword.java
+++ b/repository/src/main/java/org/alfresco/repo/workflow/WorkflowModelResetPassword.java
@@ -29,9 +29,12 @@ package org.alfresco.repo.workflow;
 import org.alfresco.service.namespace.QName;
 
 /**
+ * @deprecated from 7.1.0
+ * 
  * @author Jamal Kaabi-Mofrad
  * @since 5.2.1
  */
+@Deprecated
 public interface WorkflowModelResetPassword
 {
     // namespace