diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 9b5f522b..37e5fd76 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -5,4 +5,5 @@
 
 * @adilei @HenryJammes @nesrivastavaMS
 
-/CustomAnalytics @iMicknl @adilei @HenryJammes @nesrivastavaMS
\ No newline at end of file
+/CustomAnalytics @iMicknl @adilei @HenryJammes @nesrivastavaMS
+
diff --git a/EmployeeSelfServiceAgent/Workday/ManagerScenarios/WorkdayGetManagerReporteesTimeInPosition/topic.yaml b/EmployeeSelfServiceAgent/Workday/ManagerScenarios/WorkdayGetManagerReporteesTimeInPosition/topic.yaml
index c3b88622..e1441f4f 100644
--- a/EmployeeSelfServiceAgent/Workday/ManagerScenarios/WorkdayGetManagerReporteesTimeInPosition/topic.yaml
+++ b/EmployeeSelfServiceAgent/Workday/ManagerScenarios/WorkdayGetManagerReporteesTimeInPosition/topic.yaml
@@ -20,25 +20,24 @@ beginDialog:
   kind: OnRecognizedIntent
   id: main
   intent: {}
-  actions:
-    - kind: BeginDialog
-      id: jJpz3n
-      displayName: Redirect to Workday Get Common Execution
-      input:
-        binding:
-          parameters: ="{""params"":[{""key"":""{Manager_Org_ID}"",""value"":""" & Global.ESS_UserContext_ManagerOrganizationId & """}]}"
-          scenarioName: msdyn_GetManagerReportees
-
-      dialog: msdyn_copilotforemployeeselfservicehr.topic.WorkdaySystemGetCommonExecution
-      output:
-        binding:
-          errorResponse: Topic.errorResponse
-          isSuccess: Topic.isSuccess
-          workdayResponse: Topic.workdayResponse
-
-    - kind: ParseValue
-      id: aXVFNu
-      displayName: Parse value to a record
+actions:
+  - kind: BeginDialog
+    id: jJpz3n
+    displayName: Redirect to Workday Get Common Execution
+    input:
+      binding:
+        parameters: ="{""params"":[{""key"":""{Manager_Org_ID}"",""value"":""" & Global.ESS_UserContext_ManagerOrganizationId & """}]}"
+        scenarioName: msdyn_GetManagerReportees
+    dialog: msdyn_copilotforemployeeselfservicehr.topic.WorkdaySystemGetCommonExecution
+    output:
+      binding:
+        errorResponse: Topic.errorResponse
+        isSuccess: Topic.isSuccess
+        workdayResponse: Topic.workdayResponse
+
+  - kind: ParseValue
+    id: aXVFNu
+    displayName: Parse value to a record
       variable: Topic.workdayResponseRecord
       valueType:
         kind: Record
@@ -118,6 +117,42 @@ beginDialog:
                 Status: If(Last(FirstN(Topic.workdayResponseRecord.Status, Value)).Value = "1", "Active", "Inactive")
             }
         )
+    - kind: ConditionGroup
+      id: conditionGroup_yepfHF
+      conditions:
+        - id: conditionItem_86c1ij
+          condition: |-
+            = !IsBlank(Topic.EmployeeName)
+              &&
+              Lower(Trim(Topic.EmployeeName)) <> Lower(Trim(Global.ESS_UserContext_Employee_Firstname))
+              &&
+              Lower(Trim(Topic.EmployeeName)) <> Lower(Trim(Global.ESS_UserContext_Employee_Lastname))
+              &&
+              Lower(Trim(Topic.EmployeeName)) <> Lower(Trim(
+                Concatenate(
+                  Global.ESS_UserContext_Employee_Firstname,
+                  " ",
+                  Global.ESS_UserContext_Employee_Lastname
+                )
+              ))
+              &&
+                Lower(Trim(Topic.EmployeeName)) <> Lower(Trim(
+                  Concatenate(
+                    Global.ESS_UserContext_Employee_Lastname,
+                    " ",
+                    Global.ESS_UserContext_Employee_Firstname
+                  )
+                ))
+              &&
+                Lower(Trim(Topic.EmployeeName)) <> Lower(Trim(
+                  Concatenate(
+                    Global.ESS_UserContext_Employee_Lastname,
+                    ", ",
+                    Global.ESS_UserContext_Employee_Firstname
+                  )
+                ))
+          displayName: Check if EmployeeName provided and is not the manager
+          actions:
 
     - kind: SetVariable
       id: setVariable_AddTimeInPosition
diff --git a/EmployeeSelfServiceAgent/Workday/ManagerScenarios/WorkdayManagersdirect-CostCenter/topic.yaml b/EmployeeSelfServiceAgent/Workday/ManagerScenarios/WorkdayManagersdirect-CostCenter/topic.yaml
index f22dfda5..a976903d 100644
--- a/EmployeeSelfServiceAgent/Workday/ManagerScenarios/WorkdayManagersdirect-CostCenter/topic.yaml
+++ b/EmployeeSelfServiceAgent/Workday/ManagerScenarios/WorkdayManagersdirect-CostCenter/topic.yaml
@@ -5,7 +5,7 @@ modelDescription: |-
   Example invalid requests:
   "What is my manager's cost center?"
   "What is my sister's cost center?"
-  
+   
   Example valid request:
   "What is the cost center of my direct reports?"