diff --git a/src/Apps/W1/ExpenseAgent/app/src/MasterData/Pages/ExpenseCategoryCard.Page.al b/src/Apps/W1/ExpenseAgent/app/src/MasterData/Pages/ExpenseCategoryCard.Page.al
index 2901998e11b..96d5e9a724d 100644
--- a/src/Apps/W1/ExpenseAgent/app/src/MasterData/Pages/ExpenseCategoryCard.Page.al
+++ b/src/Apps/W1/ExpenseAgent/app/src/MasterData/Pages/ExpenseCategoryCard.Page.al
@@ -109,11 +109,18 @@ page 6945 "Expense Category Card"
 
     trigger OnQueryClosePage(CloseAction: Action): Boolean
     begin
-        if Rec."Expense Detail Required" = Rec."Expense Detail Required"::Itemize then
-            CheckShowConfirmationForSubCategories(Rec);
+        if not IsDeletingCategory then
+            if Rec."Expense Detail Required" = Rec."Expense Detail Required"::Itemize then
+                CheckShowConfirmationForSubCategories(Rec);
+    end;
+
+    trigger OnDeleteRecord(): Boolean
+    begin
+        IsDeletingCategory := true;
     end;
 
     var
+        IsDeletingCategory: Boolean;
         ContinueWithMissingSubcategoryQst: Label 'You have not added any subcategories for expense category %1 where %2 is %3.\\ It will be required to be added before you can use this expense category.\\ Do you want to continue without adding subcategories ?', Comment = '%1 - Expense Category Code, %2 - Field Name "Expense Detail Required", %3 - Expense Detail Required';
 
     local procedure CheckShowConfirmationForSubCategories(ExpenseCategory: Record "Expense Category")
diff --git a/src/Apps/W1/ExpenseAgent/app/src/MasterData/Pages/ExpenseUser.Page.al b/src/Apps/W1/ExpenseAgent/app/src/MasterData/Pages/ExpenseUser.Page.al
index 974fe4314ce..32eb9842e02 100644
--- a/src/Apps/W1/ExpenseAgent/app/src/MasterData/Pages/ExpenseUser.Page.al
+++ b/src/Apps/W1/ExpenseAgent/app/src/MasterData/Pages/ExpenseUser.Page.al
@@ -234,16 +234,18 @@ page 6949 "Expense User"
 
     trigger OnDeleteRecord(): Boolean
     begin
-        exit(Rec.ConfirmApproverReassignment());
+        IsDeletingExpenseUser := Rec.ConfirmApproverReassignment();
+        exit(IsDeletingExpenseUser);
     end;
 
     trigger OnQueryClosePage(CloseAction: Action): Boolean
     var
         ConfirmManagement: Codeunit "Confirm Management";
     begin
-        if Rec."Employee No." = '' then
-            if not ConfirmManagement.GetResponseOrDefault(StrSubstNo(CloseWithoutEmployeeNoQst, Rec.FieldCaption("Employee No.")), true) then
-                exit(false);
+        if not IsDeletingExpenseUser then
+            if Rec."Employee No." = '' then
+                if not ConfirmManagement.GetResponseOrDefault(StrSubstNo(CloseWithoutEmployeeNoQst, Rec.FieldCaption("Employee No.")), true) then
+                    exit(false);
     end;
 
     trigger OnOpenPage()
@@ -260,6 +262,7 @@ page 6949 "Expense User"
     var
         NoFieldVisible: Boolean;
         IsCreateEmployeeVisible: Boolean;
+        IsDeletingExpenseUser: Boolean;
         CloseWithoutEmployeeNoQst: Label '%1 is blank. The expense user will not be linked to an employee.\\Are you sure you want to exit?', Comment = '%1 = Employee No. field caption';
 
     local procedure SetCodeFieldVisible()