diff --git a/src/Frontend/src/views/throughputreport/EndpointsView.vue b/src/Frontend/src/views/throughputreport/EndpointsView.vue
index 65e4b9845..d54fddbf2 100644
--- a/src/Frontend/src/views/throughputreport/EndpointsView.vue
+++ b/src/Frontend/src/views/throughputreport/EndpointsView.vue
@@ -9,7 +9,6 @@ import LegendNServiceBusEndpoint from "./LegendNServiceBusEndpoint.vue";
 import LegendNServiceBusEndpointNoLongerInUse from "./LegendNServiceBusEndpointNoLongerInUse.vue";
 import LegendTransactionalSessionProcessorEndpoint from "./LegendTransactionalSessionProcessorEndpoint.vue";
 import LegendSendOnlyEndpoint from "./LegendSendOnlyEndpoint.vue";
-import LegendPlannedToDecommission from "./LegendPlannedToDecommission.vue";
 import LegendNotNServiceBusEndpoint from "./LegendNotNServiceBusEndpoint.vue";
 import LegendGatewayOrBridgeEndpoint from "./LegendGatewayOrBridgeEndpoint.vue";
 import LegendParticularPlatformEndpoint from "./LegendParticularPlatformEndpoint.vue";
@@ -32,13 +31,12 @@ const showLegend = ref(false);
 
 const legendOptions = new Map<UserIndicator, Component>([
   [UserIndicator.NServiceBusEndpoint, LegendNServiceBusEndpoint],
-  [UserIndicator.NServiceBusEndpointNoLongerInUse, LegendNServiceBusEndpointNoLongerInUse],
-  [UserIndicator.TransactionalSessionProcessorEndpoint, LegendTransactionalSessionProcessorEndpoint],
   [UserIndicator.SendOnlyEndpoint, LegendSendOnlyEndpoint],
-  [UserIndicator.PlannedToDecommission, LegendPlannedToDecommission],
-  [UserIndicator.NotNServiceBusEndpoint, LegendNotNServiceBusEndpoint],
+  [UserIndicator.TransactionalSessionProcessorEndpoint, LegendTransactionalSessionProcessorEndpoint],
   [UserIndicator.GatewayOrBridgingEndpoint, LegendGatewayOrBridgeEndpoint],
   [UserIndicator.ParticularPlatformEndpoint, LegendParticularPlatformEndpoint],
+  [UserIndicator.NServiceBusEndpointNoLongerInUse, LegendNServiceBusEndpointNoLongerInUse],
+  [UserIndicator.NotNServiceBusEndpoint, LegendNotNServiceBusEndpoint],
 ]);
 
 function toggleOptionsLegendVisible() {
diff --git a/src/Frontend/src/views/throughputreport/LegendPlannedToDecommission.vue b/src/Frontend/src/views/throughputreport/LegendPlannedToDecommission.vue
deleted file mode 100644
index 02393eb69..000000000
--- a/src/Frontend/src/views/throughputreport/LegendPlannedToDecommission.vue
+++ /dev/null
@@ -1,3 +0,0 @@
-<template>
-  <span>If the endpoint is planned to no longer be used in the next 30 days</span>
-</template>
diff --git a/src/Frontend/src/views/throughputreport/queues/DetectedBrokerQueuesView.vue b/src/Frontend/src/views/throughputreport/queues/DetectedBrokerQueuesView.vue
index 56914f305..45ed87ee1 100644
--- a/src/Frontend/src/views/throughputreport/queues/DetectedBrokerQueuesView.vue
+++ b/src/Frontend/src/views/throughputreport/queues/DetectedBrokerQueuesView.vue
@@ -26,14 +26,14 @@ const { testResults } = storeToRefs(store);
     ariaLabel="Detected broker queues"
     :indicator-options="[
       UserIndicator.NServiceBusEndpoint,
-      UserIndicator.NotNServiceBusEndpoint,
-      UserIndicator.TransactionalSessionProcessorEndpoint,
       UserIndicator.SendOnlyEndpoint,
-      UserIndicator.NServiceBusEndpointNoLongerInUse,
-      UserIndicator.PlannedToDecommission,
+      UserIndicator.TransactionalSessionProcessorEndpoint,
       UserIndicator.GatewayOrBridgingEndpoint,
       UserIndicator.ParticularPlatformEndpoint,
+      UserIndicator.NServiceBusEndpointNoLongerInUse,
+      UserIndicator.NotNServiceBusEndpoint,
     ]"
+    :legacy-indicator-options="[UserIndicator.PlannedToDecommission]"
     :source="DataSource.Broker"
     column-title="Queue Name"
     :show-endpoint-type-placeholder="true"
diff --git a/src/Frontend/src/views/throughputreport/queues/DetectedEndpointsView.vue b/src/Frontend/src/views/throughputreport/queues/DetectedEndpointsView.vue
index a6d3b91e4..aed73eea5 100644
--- a/src/Frontend/src/views/throughputreport/queues/DetectedEndpointsView.vue
+++ b/src/Frontend/src/views/throughputreport/queues/DetectedEndpointsView.vue
@@ -28,13 +28,13 @@ const { isBrokerTransport, hasErrors } = storeToRefs(store);
     ariaLabel="Detected endpoints"
     :indicator-options="[
       UserIndicator.NServiceBusEndpoint,
-      UserIndicator.TransactionalSessionProcessorEndpoint,
       UserIndicator.SendOnlyEndpoint,
-      UserIndicator.NServiceBusEndpointNoLongerInUse,
-      UserIndicator.PlannedToDecommission,
+      UserIndicator.TransactionalSessionProcessorEndpoint,
       UserIndicator.GatewayOrBridgingEndpoint,
       UserIndicator.ParticularPlatformEndpoint,
+      UserIndicator.NServiceBusEndpointNoLongerInUse,
     ]"
+    :legacy-indicator-options="[UserIndicator.PlannedToDecommission]"
     :source="DataSource.WellKnownEndpoint"
     column-title="Endpoint Name"
     :show-endpoint-type-placeholder="false"
diff --git a/src/Frontend/src/views/throughputreport/queues/DetectedListView.spec.ts b/src/Frontend/src/views/throughputreport/queues/DetectedListView.spec.ts
index fd1808570..5aa0c0a94 100644
--- a/src/Frontend/src/views/throughputreport/queues/DetectedListView.spec.ts
+++ b/src/Frontend/src/views/throughputreport/queues/DetectedListView.spec.ts
@@ -163,9 +163,9 @@ describe("DetectedListView tests", () => {
       await renderComponent({ source: DataSource.Broker, indicatorOptions: [UserIndicator.NServiceBusEndpoint], ariaLabel: tableName }, async (driver) => {
         await driver.setUp(
           precondition.hasLicensingEndpoints([
-            ...[...Array(5).keys()].map((i) => ({ name: `${i}Beta`, name_hash: "", is_known_endpoint: false, user_indicator: UserIndicator.PlannedToDecommission, max_daily_throughput: i })),
-            ...[...Array(8).keys()].map((i) => ({ name: `${i}Beta`, name_hash: "", is_known_endpoint: false, user_indicator: UserIndicator.PlannedToDecommission, max_daily_throughput: i })),
-            ...[...Array(2).keys()].map((i) => ({ name: `${i}Delta${i}`, name_hash: "", is_known_endpoint: false, user_indicator: UserIndicator.PlannedToDecommission, max_daily_throughput: i })),
+            ...[...Array(5).keys()].map((i) => ({ name: `${i}Beta`, name_hash: "", is_known_endpoint: false, user_indicator: UserIndicator.NServiceBusEndpointNoLongerInUse, max_daily_throughput: i })),
+            ...[...Array(8).keys()].map((i) => ({ name: `${i}Beta`, name_hash: "", is_known_endpoint: false, user_indicator: UserIndicator.NServiceBusEndpointNoLongerInUse, max_daily_throughput: i })),
+            ...[...Array(2).keys()].map((i) => ({ name: `${i}Delta${i}`, name_hash: "", is_known_endpoint: false, user_indicator: UserIndicator.NServiceBusEndpointNoLongerInUse, max_daily_throughput: i })),
             { name: "boo", name_hash: "", is_known_endpoint: false, user_indicator: "", max_daily_throughput: 11 },
           ])
         );
@@ -194,7 +194,7 @@ describe("DetectedListView tests", () => {
 
       await renderComponent({ source: DataSource.Broker, indicatorOptions: [UserIndicator.NServiceBusEndpoint], ariaLabel: tableName }, async (driver) => {
         await driver.setUp(
-          precondition.hasLicensingEndpoints([...[...Array(dataLength).keys()].map((i) => ({ name: `${i}Beta`, name_hash: "", is_known_endpoint: false, user_indicator: UserIndicator.PlannedToDecommission, max_daily_throughput: i }))])
+          precondition.hasLicensingEndpoints([...[...Array(dataLength).keys()].map((i) => ({ name: `${i}Beta`, name_hash: "", is_known_endpoint: false, user_indicator: UserIndicator.NServiceBusEndpointNoLongerInUse, max_daily_throughput: i }))])
         );
       });
 
@@ -245,7 +245,9 @@ describe("DetectedListView tests", () => {
       ];
 
       await renderComponent({ source: DataSource.Broker, indicatorOptions: [UserIndicator.NServiceBusEndpoint], ariaLabel: tableName }, async (driver) => {
-        await driver.setUp(precondition.hasLicensingEndpoints([...[...unsortedNames].map((name, idx) => ({ name, name_hash: "", is_known_endpoint: false, user_indicator: UserIndicator.PlannedToDecommission, max_daily_throughput: idx }))]));
+        await driver.setUp(
+          precondition.hasLicensingEndpoints([...[...unsortedNames].map((name, idx) => ({ name, name_hash: "", is_known_endpoint: false, user_indicator: UserIndicator.NServiceBusEndpointNoLongerInUse, max_daily_throughput: idx }))])
+        );
       });
 
       const user = userEvent.setup();
@@ -293,11 +295,11 @@ describe("DetectedListView tests", () => {
     const setup = async () => {
       const tableName = "Special table";
 
-      const { driver } = await renderComponent({ source: DataSource.Broker, indicatorOptions: [UserIndicator.PlannedToDecommission, UserIndicator.NServiceBusEndpoint], ariaLabel: tableName }, async (driver) => {
+      const { driver } = await renderComponent({ source: DataSource.Broker, indicatorOptions: [UserIndicator.NServiceBusEndpointNoLongerInUse, UserIndicator.NServiceBusEndpoint], ariaLabel: tableName }, async (driver) => {
         await driver.setUp(
           precondition.hasLicensingEndpoints([
             { name: `Not set yet`, name_hash: "", is_known_endpoint: false, user_indicator: "", max_daily_throughput: 100 },
-            { name: `Set and needs updating`, name_hash: "", is_known_endpoint: false, user_indicator: UserIndicator.PlannedToDecommission, max_daily_throughput: 50 },
+            { name: `Set and needs updating`, name_hash: "", is_known_endpoint: false, user_indicator: UserIndicator.NServiceBusEndpointNoLongerInUse, max_daily_throughput: 50 },
           ])
         );
         await driver.setUp(updateLicensingEndpoints());
diff --git a/src/Frontend/src/views/throughputreport/queues/DetectedListView.vue b/src/Frontend/src/views/throughputreport/queues/DetectedListView.vue
index bcfd01c6e..9cbaa96c7 100644
--- a/src/Frontend/src/views/throughputreport/queues/DetectedListView.vue
+++ b/src/Frontend/src/views/throughputreport/queues/DetectedListView.vue
@@ -45,6 +45,7 @@ export interface DetectedListViewProps {
   columnTitle: string;
   showEndpointTypePlaceholder: boolean;
   indicatorOptions: UserIndicator[];
+  legacyIndicatorOptions?: UserIndicator[];
   source: DataSource;
 }
 
@@ -258,6 +259,9 @@ async function save() {
           <select class="form-select endpointType format-text" @change="(event) => updateIndicator(event, row.name)">
             <option v-if="props.showEndpointTypePlaceholder" value="">Pick the most appropriate option</option>
             <option v-for="item in props.indicatorOptions" :key="item" :value="item" :selected="(dataChanges.get(row.name)?.indicator ?? getDefaultEndpointType(row)) === item">{{ userIndicatorMapper.get(item) }}</option>
+            <option v-for="item in props.legacyIndicatorOptions?.filter((legacy) => row.user_indicator === legacy)" :key="item" :value="item" :selected="dataChanges.get(row.name)?.indicator === item">
+              {{ userIndicatorMapper.get(item) }}
+            </option>
           </select>
         </td>
       </tr>
diff --git a/src/Frontend/src/views/throughputreport/queues/userIndicator.ts b/src/Frontend/src/views/throughputreport/queues/userIndicator.ts
index e0d1199d2..300a869c0 100644
--- a/src/Frontend/src/views/throughputreport/queues/userIndicator.ts
+++ b/src/Frontend/src/views/throughputreport/queues/userIndicator.ts
@@ -4,7 +4,7 @@ export enum UserIndicator {
   TransactionalSessionProcessorEndpoint = "TransactionalSessionProcessorEndpoint",
   SendOnlyEndpoint = "SendOnlyEndpoint",
   NServiceBusEndpointNoLongerInUse = "NServiceBusEndpointNoLongerInUse",
-  PlannedToDecommission = "PlannedToDecommission",
   GatewayOrBridgingEndpoint = "GatewayOrBridgingEndpoint",
   ParticularPlatformEndpoint = "ParticularPlatformEndpoint",
+  PlannedToDecommission = "PlannedToDecommission",
 }
diff --git a/src/Frontend/src/views/throughputreport/queues/userIndicatorMapper.ts b/src/Frontend/src/views/throughputreport/queues/userIndicatorMapper.ts
index 7ae3d57da..fd261b89a 100644
--- a/src/Frontend/src/views/throughputreport/queues/userIndicatorMapper.ts
+++ b/src/Frontend/src/views/throughputreport/queues/userIndicatorMapper.ts
@@ -5,8 +5,8 @@ export const userIndicatorMapper = new Map<UserIndicator, string>([
   [UserIndicator.NServiceBusEndpointNoLongerInUse, "No longer in use"],
   [UserIndicator.TransactionalSessionProcessorEndpoint, "Transactional Session Processor Endpoint"],
   [UserIndicator.SendOnlyEndpoint, "Send-Only Endpoint"],
-  [UserIndicator.PlannedToDecommission, "Planned to be decommissioned"],
   [UserIndicator.NotNServiceBusEndpoint, "Not an NServiceBus Endpoint"],
   [UserIndicator.GatewayOrBridgingEndpoint, "Gateway or Bridging Endpoint"],
   [UserIndicator.ParticularPlatformEndpoint, "Particular Platform Infrastructure Endpoint"],
+  [UserIndicator.PlannedToDecommission, "Planned to be decommissioned"],
 ]);