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 0562766357..b6d1e633ad 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 @@ -712,7 +712,7 @@ public class PeopleImpl implements People Boolean isEnabled = person.isEnabled(); if (isEnabled != null) { - if (isAdminAuthority(personIdToUpdate)) + if (!isEnabled && isAdminAuthority(personIdToUpdate)) { throw new PermissionDeniedException("Admin authority cannot be disabled."); } diff --git a/remote-api/src/main/java/org/alfresco/rest/api/model/Person.java b/remote-api/src/main/java/org/alfresco/rest/api/model/Person.java index 90f02b8f1b..b7368ecd47 100644 --- a/remote-api/src/main/java/org/alfresco/rest/api/model/Person.java +++ b/remote-api/src/main/java/org/alfresco/rest/api/model/Person.java @@ -266,7 +266,7 @@ public class Person implements Serializable public Boolean isEnabled() { - return enabled; + return enabled == null ? Boolean.FALSE : enabled; } public void setEnabled(Boolean enabled)