diff --git a/reports/AccountReport.ts b/reports/AccountReport.ts
index 530a750f..0ead699d 100644
--- a/reports/AccountReport.ts
+++ b/reports/AccountReport.ts
@@ -286,7 +286,7 @@ export abstract class AccountReport extends LedgerReport {
         this.fromYear!,
         this.fyo
       );
-      toDate = fy.toDate;
+      toDate = DateTime.fromISO(fy.toDate).plus({ days: 1 }).toISODate();
       fromDate = fy.fromDate;
     }
 
diff --git a/src/pages/TemplateBuilder/TemplateBuilder.vue b/src/pages/TemplateBuilder/TemplateBuilder.vue
index 1bf66a77..faa0ac48 100644
--- a/src/pages/TemplateBuilder/TemplateBuilder.vue
+++ b/src/pages/TemplateBuilder/TemplateBuilder.vue
@@ -324,6 +324,10 @@ export default defineComponent({
     if (this.editMode) {
       this.disableEditMode();
     }
+
+    if (this.doc?.dirty) {
+      return;
+    }
     this.reset();
   },
   methods: {