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 1c7bd9bf34..c581b3db7c 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
@@ -538,7 +538,7 @@ public class ResetPasswordServiceImpl implements ResetPasswordService
 
         String pageUrl = clientApp.getProperty("resetPasswordPageUrl");
 
-        if(clientApp.getName().equals("workspace"))
+        if(!StringUtils.isEmpty(clientApp.getProperty("workspaceUrl")))
         {
             String workspaceUrl = clientApp.getProperty("workspaceUrl");