diff --git a/lib/models/application_model.dart b/lib/models/application_model.dart
index 52ff7fdc8a36fabbba82f79f0780c67f6f09f6db..6e531c7b9ae2495879bf93809202f72874a4cdf8 100644
--- a/lib/models/application_model.dart
+++ b/lib/models/application_model.dart
@@ -14,6 +14,7 @@ class Application {
   final String scheduledDate;
   final String createdDate;
   final String createdBy;
+  final String updatedBy;
 
   const Application({
     required this.formId,
@@ -31,6 +32,7 @@ class Application {
     required this.scheduledDate,
     required this.createdDate,
     required this.createdBy,
+    required this.updatedBy,
   });
 
   factory Application.fromJson(Map<String, dynamic> json) {
@@ -58,6 +60,7 @@ class Application {
           json['inspection'] != null ? json['inspection']['scheduledDate'] : '',
       createdDate: json['createdDate'],
       createdBy: json['createdBy'],
+      updatedBy: json['updatedBy'] ?? "",
     );
   }
 
diff --git a/lib/pages/application_details_page.dart b/lib/pages/application_details_page.dart
index bc5b4c5ea49b078ad25fcee1f31fcb58438a3340..1189651012d796ff2c864c7f3206206c324b9a12 100644
--- a/lib/pages/application_details_page.dart
+++ b/lib/pages/application_details_page.dart
@@ -284,6 +284,7 @@ class _ApplicationDetailsPageState extends State<ApplicationDetailsPage>
       //Validate assessment form to make sure all inputs are given by the assessor when second assessor submmits the form
       if (widget.application.inspectionStatus ==
           InspectionStatus.leadInspectorCompleted) {
+        data["inspectionCompleted"] = true;
         isValidForm = true;
         for (int i = 0; i < fieldsLength; i++) {
           _data[_data.keys.elementAt(i)].forEach((key, value) {
diff --git a/lib/pages/home_page.dart b/lib/pages/home_page.dart
index b6baa46ffdd3a09d171f94c29a56af3b539d4670..08dd71e04ff87b02ac77728dd4138caf8f4b35c4 100644
--- a/lib/pages/home_page.dart
+++ b/lib/pages/home_page.dart
@@ -128,6 +128,7 @@ class _HomePageState extends State<HomePage> with WidgetsBindingObserver {
 
   Future<dynamic> _getApplications() async {
     String rawUserId = await Helper.getUser(Storage.userId);
+    String username = await Helper.getUser(Storage.username);
     int userId = int.parse(rawUserId);
     bool isInternetConnected = await Helper.isInternetConnected();
     // await Future.delayed(const Duration(milliseconds: 10));
@@ -154,17 +155,18 @@ class _HomePageState extends State<HomePage> with WidgetsBindingObserver {
           temp = List.from(temp.reversed);
           int days = Helper.getDateDiffence(
               DateTime.now(), DateTime.parse(temp.join("-")));
-          if ((days == 0 || days > 0) &&
+          if ((days == 0) &&
               application.status == InspectionStatus.sentForInspection) {
-            if (application.leadInspector[0] == userId &&
-                application.inspectionStatus ==
-                    InspectionStatus.leadInspectorCompleted) {
+            if (application.inspectionStatus ==
+                    InspectionStatus.leadInspectorCompleted &&
+                application.updatedBy == username) {
               _pastApplications.add(application);
             } else {
               _pendingApplications.add(application);
             }
-          } else if ((days == 0 || days > 0) &&
-              application.status != InspectionStatus.sentForInspection) {
+          } else if (((days == 0) &&
+                  application.status != InspectionStatus.sentForInspection) ||
+              (days > 0)) {
             _pastApplications.add(application);
           } else {
             _upcomingApplications.add(application);