diff --git a/plugins/computers/frontend/views/PCForm.vue b/plugins/computers/frontend/views/PCForm.vue
index 2b5e9b7f..0f3a0eb8 100644
--- a/plugins/computers/frontend/views/PCForm.vue
+++ b/plugins/computers/frontend/views/PCForm.vue
@@ -230,7 +230,36 @@
             v-model="form.azuredeviceid"
             type="text"
             class="form-control"
-            placeholder="Entra/Azure deviceId GUID (set by Azure imports)"
+            placeholder="Entra deviceId GUID (set by the Azure import)"
+          />
+          <small class="muted">Opens the device in Intune from the PC page.</small>
+        </div>
+
+        <!-- The OBJECT id, not the device id. Entra gives a device both and
+             they address different places: deviceId opens Intune, objectId
+             opens the Entra device record. The import populates both, so a
+             page showing only one left the other uneditable when it was
+             wrong. -->
+        <div class="form-group">
+          <label for="azureobjectid">Azure Object ID</label>
+          <input
+            id="azureobjectid"
+            v-model="form.azureobjectid"
+            type="text"
+            class="form-control"
+            placeholder="Entra objectId GUID (set by the Azure import)"
+          />
+          <small class="muted">Opens the device in Entra from the PC page.</small>
+        </div>
+
+        <div class="form-group">
+          <label for="azuredevicecategory">Azure Device Category</label>
+          <input
+            id="azuredevicecategory"
+            v-model="form.azuredevicecategory"
+            type="text"
+            class="form-control"
+            placeholder="Entra device category or group label"
           />
         </div>
 
@@ -395,6 +424,8 @@ const form = ref({
   osid: '',
   loggedinuser: '',
   azuredeviceid: '',
+  azureobjectid: '',
+  azuredevicecategory: '',
   accessmethods: [],
   notes: '',
   mapx: null,
@@ -529,6 +560,8 @@ onMounted(async () => {
         osid: ext.osid || '',
         loggedinuser: ext.loggedinuser || '',
         azuredeviceid: ext.azuredeviceid || '',
+        azureobjectid: ext.azureobjectid || '',
+        azuredevicecategory: ext.azuredevicecategory || '',
         accessmethods: (pc.accessmethods || []).map(a => ({
           protocolid: a.protocolid,
           portoverride: a.portoverride ?? null
@@ -605,6 +638,8 @@ async function savePC() {
       osid: form.value.osid || null,
       loggedinuser: form.value.loggedinuser || null,
       azuredeviceid: form.value.azuredeviceid || null,
+      azureobjectid: form.value.azureobjectid || null,
+      azuredevicecategory: form.value.azuredevicecategory || null,
       accessmethods: form.value.accessmethods,
       notes: form.value.notes || null,
       ipaddress: form.value.ipaddress || null,
diff --git a/plugins/machines/frontend/views/MachineForm.vue b/plugins/machines/frontend/views/MachineForm.vue
index 15e603e8..4f159a5c 100644
--- a/plugins/machines/frontend/views/MachineForm.vue
+++ b/plugins/machines/frontend/views/MachineForm.vue
@@ -336,6 +336,44 @@
 
         <!-- Notes Section -->
         <h3 class="form-section-title">Notes</h3>
+        <!-- Maintenance. Shown on the detail page since it was added but never
+             editable, so a wrong date needed database access to correct. These
+             are the columns a measuring instrument's calibration dates map onto
+             when metrology moves to machines, which is the other reason they
+             have to be enterable. -->
+        <div class="form-group">
+          <label for="lastmaintenancedate">Last Maintenance</label>
+          <input
+            id="lastmaintenancedate"
+            v-model="form.lastmaintenancedate"
+            type="date"
+            class="form-control"
+          />
+        </div>
+
+        <div class="form-group">
+          <label for="nextmaintenancedate">Next Maintenance</label>
+          <input
+            id="nextmaintenancedate"
+            v-model="form.nextmaintenancedate"
+            type="date"
+            class="form-control"
+          />
+          <small class="muted">Set directly; it is not derived from the interval.</small>
+        </div>
+
+        <div class="form-group">
+          <label for="maintenanceintervaldays">Maintenance Interval (days)</label>
+          <input
+            id="maintenanceintervaldays"
+            v-model.number="form.maintenanceintervaldays"
+            type="number"
+            min="1"
+            class="form-control"
+            placeholder="e.g. 180"
+          />
+        </div>
+
         <div class="form-group">
           <textarea
             id="notes"
@@ -420,6 +458,9 @@ const form = ref({
   businessunitid: '',
   requiresmanualconfig: false,
   islocationonly: false,
+  lastmaintenancedate: '',
+  nextmaintenancedate: '',
+  maintenanceintervaldays: null,
   notes: '',
   mapx: null,
   mapy: null,
@@ -613,6 +654,9 @@ onMounted(async () => {
         businessunitid: data.businessunitid || '',
         requiresmanualconfig: data.machine?.requiresmanualconfig || false,
         islocationonly: data.machine?.islocationonly || false,
+        lastmaintenancedate: (data.machine?.lastmaintenancedate || '').slice(0, 10),
+        nextmaintenancedate: (data.machine?.nextmaintenancedate || '').slice(0, 10),
+        maintenanceintervaldays: data.machine?.maintenanceintervaldays ?? null,
         notes: data.notes || '',
         mapx: data.mapx ?? null,
         mapy: data.mapy ?? null,
@@ -714,6 +758,9 @@ async function saveMachine() {
       businessunitid: form.value.businessunitid || null,
       requiresmanualconfig: form.value.requiresmanualconfig,
       islocationonly: form.value.islocationonly,
+      lastmaintenancedate: form.value.lastmaintenancedate || null,
+      nextmaintenancedate: form.value.nextmaintenancedate || null,
+      maintenanceintervaldays: form.value.maintenanceintervaldays || null,
       notes: form.value.notes || null,
       mapx: form.value.mapx,
       mapy: form.value.mapy
diff --git a/plugins/printers/frontend/views/PrinterForm.vue b/plugins/printers/frontend/views/PrinterForm.vue
index 65670487..9a92f7d8 100644
--- a/plugins/printers/frontend/views/PrinterForm.vue
+++ b/plugins/printers/frontend/views/PrinterForm.vue
@@ -223,6 +223,28 @@
           </div>
         </div>
 
+        <!-- Capabilities. On the detail page since they were added but never
+             editable, so a wrong one needed database access to correct.
+             Nothing writes these automatically - the collector reports queues
+             and supplies, not capabilities - so a person is the only source. -->
+        <div class="form-group">
+          <label>Capabilities</label>
+          <div class="capability-list">
+            <label class="capability-item">
+              <input type="checkbox" v-model="form.iscolor" />
+              <span>Colour</span>
+            </label>
+            <label class="capability-item">
+              <input type="checkbox" v-model="form.isduplex" />
+              <span>Duplex</span>
+            </label>
+            <label class="capability-item">
+              <input type="checkbox" v-model="form.isnetwork" />
+              <span>Network</span>
+            </label>
+          </div>
+        </div>
+
         <div class="form-group">
           <label for="installpath">Driver Install Path</label>
           <input
@@ -361,7 +383,12 @@ const form = ref({
   ipaddress: '',
   csfname: '',
   installpath: '',
-  pin: ''
+  pin: '',
+  iscolor: false,
+  isduplex: false,
+  // true to match the create default in the API; most printers here are
+  // networked and a new record that claimed otherwise would be wrong.
+  isnetwork: true
 })
 
 const printerTypes = ref([])
@@ -559,6 +586,9 @@ onMounted(async () => {
         modelnumberid: ext.modelnumberid || '',
         locationid: printer.locationid || '',
         notes: printer.notes || '',
+        iscolor: !!printer.printer?.iscolor,
+        isduplex: !!printer.printer?.isduplex,
+        isnetwork: printer.printer?.isnetwork !== false,
         mapx: printer.mapx ?? null,
         mapy: printer.mapy ?? null,
         levelid: printer.levelid ?? null,
@@ -652,6 +682,9 @@ async function savePrinter() {
       installpath: form.value.installpath || null,
       pin: form.value.pin || null,
       ipaddress: form.value.ipaddress || null,
+      iscolor: !!form.value.iscolor,
+      isduplex: !!form.value.isduplex,
+      isnetwork: !!form.value.isnetwork,
       mapx: form.value.mapx,
       mapy: form.value.mapy
     }
@@ -688,6 +721,9 @@ async function savePrinter() {
 </script>
 
 <style scoped>
+.capability-list { display: flex; flex-wrap: wrap; gap: 1rem; }
+.capability-item { display: inline-flex; align-items: center; gap: 0.4rem; font-weight: normal; }
+
 .map-location-control {
   display: flex;
   align-items: center;