diff --git a/BMA.EHR.Leave/Controllers/LeaveController.cs b/BMA.EHR.Leave/Controllers/LeaveController.cs
index e8eb61f2..591c7382 100644
--- a/BMA.EHR.Leave/Controllers/LeaveController.cs
+++ b/BMA.EHR.Leave/Controllers/LeaveController.cs
@@ -1296,7 +1296,7 @@ namespace BMA.EHR.Leave.Service.Controllers
                                         ? profileAdmin?.RootDnaId
                                         : "";
             }
-            else if (role == "ROOT" && role == "PARENT")
+            else if (role == "ROOT" || role == "PARENT")
             {
                 nodeId = profileAdmin?.RootDnaId;
             }
@@ -1592,7 +1592,7 @@ namespace BMA.EHR.Leave.Service.Controllers
                                         ? profileAdmin?.RootDnaId
                                         : "";
             }
-            else if (role == "ROOT" && role == "PARENT")
+            else if (role == "ROOT" || role == "PARENT")
             {
                 nodeId = profileAdmin?.RootDnaId;
             }
@@ -2429,7 +2429,7 @@ namespace BMA.EHR.Leave.Service.Controllers
                                         ? profileAdmin?.RootDnaId
                                         : "";
             }
-            else if (role == "ROOT" && role == "PARENT")
+            else if (role == "ROOT" || role == "PARENT")
             {
                 nodeId = profileAdmin?.RootDnaId;
             }
diff --git a/BMA.EHR.Leave/Controllers/LeaveReportController.cs b/BMA.EHR.Leave/Controllers/LeaveReportController.cs
index 703ca37f..b826077d 100644
--- a/BMA.EHR.Leave/Controllers/LeaveReportController.cs
+++ b/BMA.EHR.Leave/Controllers/LeaveReportController.cs
@@ -918,7 +918,7 @@ namespace BMA.EHR.Leave.Service.Controllers
                                             ? profileAdmin?.RootDnaId
                                             : "";
                 }
-                else if (role == "ROOT" && role == "PARENT")
+                else if (role == "ROOT" || role == "PARENT")
                 {
                     nodeId = profileAdmin?.RootDnaId;
                 }
@@ -1535,7 +1535,7 @@ namespace BMA.EHR.Leave.Service.Controllers
                                             ? profileAdmin?.RootDnaId
                                             : "";
                 }
-                else if (role == "ROOT" && role == "PARENT")
+                else if (role == "ROOT" || role == "PARENT")
                 {
                     nodeId = profileAdmin?.RootDnaId;
                 }
@@ -1861,7 +1861,7 @@ namespace BMA.EHR.Leave.Service.Controllers
                                             ? profileAdmin?.RootDnaId
                                             : "";
                 }
-                else if (role == "ROOT" && role == "PARENT")
+                else if (role == "ROOT" || role == "PARENT")
                 {
                     nodeId = profileAdmin?.RootDnaId;
                 }
@@ -2267,7 +2267,7 @@ namespace BMA.EHR.Leave.Service.Controllers
                                             ? profileAdmin?.RootDnaId
                                             : "";
                 }
-                else if (role == "ROOT" && role == "PARENT")
+                else if (role == "ROOT" || role == "PARENT")
                 {
                     nodeId = profileAdmin?.RootDnaId;
                 }
@@ -2376,7 +2376,7 @@ namespace BMA.EHR.Leave.Service.Controllers
                                             ? profileAdmin?.RootDnaId
                                             : "";
                 }
-                else if (role == "ROOT" && role == "PARENT")
+                else if (role == "ROOT" || role == "PARENT")
                 {
                     nodeId = profileAdmin?.RootDnaId;
                 }
diff --git a/BMA.EHR.Leave/Controllers/LeaveRequestController.cs b/BMA.EHR.Leave/Controllers/LeaveRequestController.cs
index 7808b7b5..9c8be6b8 100644
--- a/BMA.EHR.Leave/Controllers/LeaveRequestController.cs
+++ b/BMA.EHR.Leave/Controllers/LeaveRequestController.cs
@@ -1635,7 +1635,7 @@ namespace BMA.EHR.Leave.Service.Controllers
                                         ? profileAdmin?.RootDnaId
                                         : "";
             }
-            else if (role == "ROOT" && role == "PARENT")
+            else if (role == "ROOT" || role == "PARENT")
             {
                 nodeId = profileAdmin?.RootDnaId;
             }
@@ -1820,7 +1820,7 @@ namespace BMA.EHR.Leave.Service.Controllers
                                         ? profileAdmin?.RootDnaId
                                         : "";
             }
-            else if (role == "ROOT" && role == "PARENT")
+            else if (role == "ROOT" || role == "PARENT")
             {
                 nodeId = profileAdmin?.RootDnaId;
             }
diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentEmployeeController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentEmployeeController.cs
index d5f67e3c..07d0c57c 100644
--- a/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentEmployeeController.cs
+++ b/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentEmployeeController.cs
@@ -98,7 +98,7 @@ namespace BMA.EHR.Placement.Service.Controllers
                                         ? profileAdmin?.RootDnaId
                                         : "";
             }
-            else if (role == "ROOT" && role == "PARENT")
+            else if (role == "ROOT" || role == "PARENT")
             {
                 nodeId = profileAdmin?.RootDnaId;
             }
diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementOfficerController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementOfficerController.cs
index 23e15651..5181fa9c 100644
--- a/BMA.EHR.Placement.Service/Controllers/PlacementOfficerController.cs
+++ b/BMA.EHR.Placement.Service/Controllers/PlacementOfficerController.cs
@@ -99,7 +99,7 @@ namespace BMA.EHR.Placement.Service.Controllers
                                         ? profileAdmin?.RootDnaId
                                         : "";
             }
-            else if (role == "ROOT" && role == "PARENT")
+            else if (role == "ROOT" || role == "PARENT")
             {
                 nodeId = profileAdmin?.RootDnaId;
             }
diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementReceiveController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementReceiveController.cs
index badf80cb..4e4c28d3 100644
--- a/BMA.EHR.Placement.Service/Controllers/PlacementReceiveController.cs
+++ b/BMA.EHR.Placement.Service/Controllers/PlacementReceiveController.cs
@@ -100,7 +100,7 @@ namespace BMA.EHR.Placement.Service.Controllers
                                         ? profileAdmin?.RootDnaId
                                         : "";
             }
-            else if (role == "ROOT" && role == "PARENT")
+            else if (role == "ROOT" || role == "PARENT")
             {
                 nodeId = profileAdmin?.RootDnaId;
             }
diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementRepatriationController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementRepatriationController.cs
index 0501a802..59ddaec5 100644
--- a/BMA.EHR.Placement.Service/Controllers/PlacementRepatriationController.cs
+++ b/BMA.EHR.Placement.Service/Controllers/PlacementRepatriationController.cs
@@ -100,7 +100,7 @@ namespace BMA.EHR.Placement.Service.Controllers
                                         ? profileAdmin?.RootDnaId
                                         : "";
             }
-            else if (role == "ROOT" && role == "PARENT")
+            else if (role == "ROOT" || role == "PARENT")
             {
                 nodeId = profileAdmin?.RootDnaId;
             }
diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementTransferController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementTransferController.cs
index c88dce21..d0c8b7ba 100644
--- a/BMA.EHR.Placement.Service/Controllers/PlacementTransferController.cs
+++ b/BMA.EHR.Placement.Service/Controllers/PlacementTransferController.cs
@@ -192,7 +192,7 @@ namespace BMA.EHR.Placement.Service.Controllers
                                         ? profileAdmin?.RootDnaId
                                         : "";
             }
-            else if (role == "ROOT" && role == "PARENT")
+            else if (role == "ROOT" || role == "PARENT")
             {
                 nodeId = profileAdmin?.RootDnaId;
             }
diff --git a/BMA.EHR.Retirement.Service/Controllers/RetirementDeceasedController.cs b/BMA.EHR.Retirement.Service/Controllers/RetirementDeceasedController.cs
index af64ba10..70ef8420 100644
--- a/BMA.EHR.Retirement.Service/Controllers/RetirementDeceasedController.cs
+++ b/BMA.EHR.Retirement.Service/Controllers/RetirementDeceasedController.cs
@@ -104,7 +104,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
                                         ? profileAdmin?.RootDnaId
                                         : "";
             }
-            else if (role == "ROOT" && role == "PARENT")
+            else if (role == "ROOT" || role == "PARENT")
             {
                 nodeId = profileAdmin?.RootDnaId;
             }
diff --git a/BMA.EHR.Retirement.Service/Controllers/RetirementOtherController.cs b/BMA.EHR.Retirement.Service/Controllers/RetirementOtherController.cs
index c75eb18b..aae5b712 100644
--- a/BMA.EHR.Retirement.Service/Controllers/RetirementOtherController.cs
+++ b/BMA.EHR.Retirement.Service/Controllers/RetirementOtherController.cs
@@ -100,7 +100,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
                                         ? profileAdmin?.RootDnaId
                                         : "";
             }
-            else if (role == "ROOT" && role == "PARENT")
+            else if (role == "ROOT" || role == "PARENT")
             {
                 nodeId = profileAdmin?.RootDnaId;
             }
diff --git a/BMA.EHR.Retirement.Service/Controllers/RetirementOutController.cs b/BMA.EHR.Retirement.Service/Controllers/RetirementOutController.cs
index 17953c33..dab3e661 100644
--- a/BMA.EHR.Retirement.Service/Controllers/RetirementOutController.cs
+++ b/BMA.EHR.Retirement.Service/Controllers/RetirementOutController.cs
@@ -115,7 +115,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
                                         ? profileAdmin?.RootDnaId
                                         : "";
             }
-            else if (role == "ROOT" && role == "PARENT")
+            else if (role == "ROOT" || role == "PARENT")
             {
                 nodeId = profileAdmin?.RootDnaId;
             }
diff --git a/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs b/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs
index 4fe9a62a..dcfebb0b 100644
--- a/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs
+++ b/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs
@@ -257,7 +257,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
                                         ? profileAdmin?.RootDnaId
                                         : "";
             }
-            else if (role == "ROOT" && role == "PARENT")
+            else if (role == "ROOT" || role == "PARENT")
             {
                 nodeId = profileAdmin?.RootDnaId;
             }
@@ -366,7 +366,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
                                         ? profileAdmin?.RootDnaId
                                         : "";
             }
-            else if (role == "ROOT" && role == "PARENT")
+            else if (role == "ROOT" || role == "PARENT")
             {
                 nodeId = profileAdmin?.RootDnaId;
             }
@@ -2137,7 +2137,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
                                         ? profileAdmin?.RootDnaId
                                         : "";
             }
-            else if (role == "ROOT" && role == "PARENT")
+            else if (role == "ROOT" || role == "PARENT")
             {
                 nodeId = profileAdmin?.RootDnaId;
             }
diff --git a/BMA.EHR.Retirement.Service/Controllers/RetirementResignEmployeeController.cs b/BMA.EHR.Retirement.Service/Controllers/RetirementResignEmployeeController.cs
index 5ddc7d0e..d5b7037d 100644
--- a/BMA.EHR.Retirement.Service/Controllers/RetirementResignEmployeeController.cs
+++ b/BMA.EHR.Retirement.Service/Controllers/RetirementResignEmployeeController.cs
@@ -196,7 +196,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
                                         ? profileAdmin?.RootDnaId
                                         : "";
             }
-            else if (role == "ROOT" && role == "PARENT")
+            else if (role == "ROOT" || role == "PARENT")
             {
                 nodeId = profileAdmin?.RootDnaId;
             }
@@ -305,7 +305,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
                                         ? profileAdmin?.RootDnaId
                                         : "";
             }
-            else if (role == "ROOT" && role == "PARENT")
+            else if (role == "ROOT" || role == "PARENT")
             {
                 nodeId = profileAdmin?.RootDnaId;
             }
@@ -2053,7 +2053,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
                                         ? profileAdmin?.RootDnaId
                                         : "";
             }
-            else if (role == "ROOT" && role == "PARENT")
+            else if (role == "ROOT" || role == "PARENT")
             {
                 nodeId = profileAdmin?.RootDnaId;
             }