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 59fa15654a..5ec0fa2d0c 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
@@ -547,8 +547,7 @@ public class ResetPasswordServiceImpl implements ResetPasswordService
             sb.append("?key=").append(key)
                     .append("&id=").append(BPMEngineRegistry.createGlobalId(ActivitiConstants.ENGINE_ID, id));
         }
-        else {
-            if (StringUtils.isEmpty(pageUrl)) {
+        else if(StringUtils.isEmpty(pageUrl)) {
                 sb.append(UrlUtil.getShareUrl(sysAdminParams));
 
                 LOGGER.warn("'resetPasswordPageUrl' property is not set for the client [" + clientApp.getName()
@@ -560,7 +559,7 @@ public class ResetPasswordServiceImpl implements ResetPasswordService
 
             sb.append("?key=").append(key)
                     .append("&id=").append(BPMEngineRegistry.createGlobalId(ActivitiConstants.ENGINE_ID, id));
-        }
+
         return sb.toString();
     }