diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/populator/AbstractWorkbookPopulator.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/populator/AbstractWorkbookPopulator.java
index e9148c584..3a17a6148 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/populator/AbstractWorkbookPopulator.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/populator/AbstractWorkbookPopulator.java
@@ -66,9 +66,9 @@ public abstract class AbstractWorkbookPopulator implements WorkbookPopulator {
         try {
             SimpleDateFormat formatinDB = null;
             if (value.matches("\\d{4}-\\d{1,2}-\\d{1,2}")) {
-                formatinDB = new SimpleDateFormat("yyyy-mm-dd");
+                formatinDB = new SimpleDateFormat("yyyy-MM-dd");
             } else if (value.matches("\\d{1,2}/\\d{1,2}/\\d{4}")) {
-                formatinDB = new SimpleDateFormat("dd/mm/yyyy");
+                formatinDB = new SimpleDateFormat("dd/MM/yyyy");
             } else if (value.matches("\\d{1,2} \\w{3,12} \\d{4}")) {
                 formatinDB = new SimpleDateFormat("dd MMMM yyyy");
             }
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/service/BulkImportWorkbookPopulatorServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/service/BulkImportWorkbookPopulatorServiceImpl.java
index 6da380d70..743e6129e 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/service/BulkImportWorkbookPopulatorServiceImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/service/BulkImportWorkbookPopulatorServiceImpl.java
@@ -478,12 +478,13 @@ public class BulkImportWorkbookPopulatorServiceImpl implements BulkImportWorkboo
 
     private List<SavingsAccountData> fetchSavingsAccounts(Long officeId) {
         List<SavingsAccountData> savingsAccounts = null;
+        String activeAccounts = "sa.status_enum = 300";
         if (officeId != null) {
-            String activeAccounts = "sa.status_enum = 300";
             SearchParameters searchParameters = SearchParameters.from(activeAccounts, officeId, null, null, null);
             savingsAccounts = savingsAccountReadPlatformService.retrieveAll(searchParameters).getPageItems();
         } else {
-            savingsAccounts = savingsAccountReadPlatformService.retrieveAll(null).getPageItems();
+            SearchParameters searchParameters = SearchParameters.from(activeAccounts, null, null, null, null);
+            savingsAccounts = savingsAccountReadPlatformService.retrieveAll(searchParameters).getPageItems();
         }
         return savingsAccounts;
     }