diff --git a/app/client/src/routes/helpdesk.tsx b/app/client/src/routes/helpdesk.tsx
index 457727b1..2e861f03 100644
--- a/app/client/src/routes/helpdesk.tsx
+++ b/app/client/src/routes/helpdesk.tsx
@@ -392,6 +392,12 @@ export function Helpdesk() {
     results: SubmissionAction[];
   }>({ fetched: false, results: [] });
 
+  useEffect(() => {
+    if (helpdeskAccess === "failure") {
+      navigate("/", { replace: true });
+    }
+  }, [navigate, helpdeskAccess]);
+
   useEffect(() => {
     queryClient.resetQueries({ queryKey: ["helpdesk/submission"] });
   }, [queryClient]);
@@ -456,7 +462,11 @@ export function Helpdesk() {
   }
 
   if (helpdeskAccess === "failure") {
-    navigate("/", { replace: true });
+    /**
+     * NOTE: this is just included for completeness, as before this is rendered,
+     * the user will have been redirected to their dashboard via the useEffect()
+     */
+    return null;
   }
 
   return (
diff --git a/app/server/app/middleware.js b/app/server/app/middleware.js
index 6c90b647..1b9cee53 100644
--- a/app/server/app/middleware.js
+++ b/app/server/app/middleware.js
@@ -91,10 +91,8 @@ function ensureHelpdesk(req, res, next) {
   const userRoles = memberof?.split(",") || [];
 
   if (!userRoles.includes("csb_admin") && !userRoles.includes("csb_helpdesk")) {
-    if (!req.originalUrl.includes("/helpdesk-access")) {
-      const logMessage = `User with email ${mail} attempted to perform an admin/helpdesk action without correct privileges.`;
-      log({ level: "error", message: logMessage, req });
-    }
+    const logMessage = `User with email ${mail} attempted to perform an admin/helpdesk action without correct privileges.`;
+    log({ level: "error", message: logMessage, req });
 
     const errorStatus = 401;
     const errorMessage = `Unauthorized.`;
diff --git a/app/server/app/utilities/bap.js b/app/server/app/utilities/bap.js
index d5a03bc1..b4721cc0 100644
--- a/app/server/app/utilities/bap.js
+++ b/app/server/app/utilities/bap.js
@@ -304,7 +304,7 @@ const { submissionPeriodOpen } = require("../config/formio");
  *  CSB_Manufacturer__c: string
  *  CSB_Manufacturer_if_Other__c: string | null
  *  CSB_Annual_Fuel_Consumption__c: number
- *  Annual_Mileage__c: number
+ *  Old_Bus_Average_Annual_Mileage__c: number
  *  Old_Bus_Estimated_Remaining_Life__c: number
  *  Old_Bus_Annual_Idling_Hours__c: number
  *  New_Bus_Infra_Rebate_Requested__c: number
@@ -1465,7 +1465,7 @@ async function queryBapFor2024PRFData(req, frfReviewItemId) {
   //   CSB_Manufacturer__c,
   //   CSB_Manufacturer_if_Other__c,
   //   CSB_Annual_Fuel_Consumption__c,
-  //   Annual_Mileage__c,
+  //   Old_Bus_Average_Annual_Mileage__c,
   //   Old_Bus_Estimated_Remaining_Life__c,
   //   Old_Bus_Annual_Idling_Hours__c,
   //   New_Bus_Infra_Rebate_Requested__c,
@@ -1501,7 +1501,7 @@ async function queryBapFor2024PRFData(req, frfReviewItemId) {
         CSB_Manufacturer__c: 1,
         CSB_Manufacturer_if_Other__c: 1,
         CSB_Annual_Fuel_Consumption__c: 1,
-        Annual_Mileage__c: 1,
+        Old_Bus_Average_Annual_Mileage__c: 1,
         Old_Bus_Estimated_Remaining_Life__c: 1,
         Old_Bus_Annual_Idling_Hours__c: 1,
         New_Bus_Infra_Rebate_Requested__c: 1,
diff --git a/app/server/app/utilities/formio.js b/app/server/app/utilities/formio.js
index 983f0ade..3878932b 100644
--- a/app/server/app/utilities/formio.js
+++ b/app/server/app/utilities/formio.js
@@ -621,7 +621,7 @@ function fetchDataForPRFSubmission({ rebateYear, req, res }) {
             CSB_Manufacturer__c,
             CSB_Manufacturer_if_Other__c,
             CSB_Annual_Fuel_Consumption__c,
-            Annual_Mileage__c,
+            Old_Bus_Average_Annual_Mileage__c,
             Old_Bus_Estimated_Remaining_Life__c,
             Old_Bus_Annual_Idling_Hours__c,
             New_Bus_Infra_Rebate_Requested__c,
@@ -661,7 +661,7 @@ function fetchDataForPRFSubmission({ rebateYear, req, res }) {
             bus_existing_manufacturer: CSB_Manufacturer__c,
             bus_existing_manufacturer_other: CSB_Manufacturer_if_Other__c,
             bus_existing_annual_fuel_consumption: CSB_Annual_Fuel_Consumption__c, // prettier-ignore
-            bus_existing_annual_mileage: Annual_Mileage__c,
+            bus_existing_annual_mileage: Old_Bus_Average_Annual_Mileage__c,
             bus_existing_remaining_life: Old_Bus_Estimated_Remaining_Life__c,
             bus_existing_idling_hours: Old_Bus_Annual_Idling_Hours__c,
             bus_new_owner: {