From 2e851cf88d1bad05d034499856162860b6be12c0 Mon Sep 17 00:00:00 2001
From: DurgDineshsai <167669362+DurgDineshsai@users.noreply.github.com>
Date: Tue, 13 May 2025 10:39:16 +0530
Subject: [PATCH] [MNT-24146] Admin user unable to update passowrd

---
 .../src/main/java/org/alfresco/rest/api/impl/PeopleImpl.java    | 2 +-
 .../src/main/java/org/alfresco/rest/api/model/Person.java       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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)