diff --git a/code/modules/modular_computers/computers/item/computer_ui.dm b/code/modules/modular_computers/computers/item/computer_ui.dm
index 3e250c26e7f..4dfe84ce28b 100644
--- a/code/modules/modular_computers/computers/item/computer_ui.dm
+++ b/code/modules/modular_computers/computers/item/computer_ui.dm
@@ -57,23 +57,17 @@
 /obj/item/modular_computer/ui_data(mob/user)
 	var/list/data = get_header_data()
 	data["device_theme"] = device_theme
-	data["login"] = list()
 
-	if(computer_id_slot)
-		var/stored_name = saved_identification
-		var/stored_title = saved_job
-		if(!stored_name)
-			stored_name = "Unknown"
-		if(!stored_title)
-			stored_title = "Unknown"
-		data["login"] = list(
-			IDName = saved_identification,
-			IDJob = saved_job,
-		)
-		data["proposed_login"] = list(
-			IDName = computer_id_slot.registered_name,
-			IDJob = computer_id_slot.assignment,
-		)
+	data["login"] = list(
+		IDName = saved_identification || "Unknown",
+		IDJob = saved_job || "Unknown",
+	)
+
+	data["proposed_login"] = list(
+		IDName = computer_id_slot?.registered_name,
+		IDJob = computer_id_slot?.assignment,
+	)
+
 
 	data["removable_media"] = list()
 	if(inserted_disk)
@@ -166,18 +160,26 @@
 				if("Eject Disk")
 					if(!inserted_disk)
 						return
+
 					user.put_in_hands(inserted_disk)
 					inserted_disk = null
 					playsound(src, 'sound/machines/card_slide.ogg', 50)
+					return TRUE
+
 				if("intelliCard")
 					var/datum/computer_file/program/ai_restorer/airestore_app = locate() in stored_files
 					if(!airestore_app)
 						return
+
 					if(airestore_app.try_eject(user))
 						playsound(src, 'sound/machines/card_slide.ogg', 50)
+						return TRUE
+
 				if("ID")
 					if(RemoveID())
 						playsound(src, 'sound/machines/card_slide.ogg', 50)
+						return TRUE
+
 		if("PC_Imprint_ID")
 			saved_identification = computer_id_slot.registered_name
 			saved_job = computer_id_slot.assignment
diff --git a/tgui/packages/tgui/interfaces/NtosMain.js b/tgui/packages/tgui/interfaces/NtosMain.js
index f873066f1c0..e9da6ad90d6 100644
--- a/tgui/packages/tgui/interfaces/NtosMain.js
+++ b/tgui/packages/tgui/interfaces/NtosMain.js
@@ -12,7 +12,6 @@ export const NtosMain = (props, context) => {
     light_on,
     comp_light_color,
     removable_media = [],
-    cardholder,
     login = [],
     proposed_login = [],
     pai,
@@ -58,17 +57,17 @@ export const NtosMain = (props, context) => {
             </Stack>
           </Section>
         )}
-        {!!(cardholder && show_imprint) && (
-          <Section
-            title="User Login"
-            buttons={
-              <>
-                <Button
-                  icon="eject"
-                  content="Eject ID"
-                  disabled={!proposed_login.IDName}
-                  onClick={() => act('PC_Eject_Disk', { name: 'ID' })}
-                />
+        <Section
+          title="User Login"
+          buttons={
+            <>
+              <Button
+                icon="eject"
+                content="Eject ID"
+                disabled={!proposed_login.IDName}
+                onClick={() => act('PC_Eject_Disk', { name: 'ID' })}
+              />
+              {!!show_imprint && (
                 <Button
                   icon="dna"
                   content="Imprint ID"
@@ -79,18 +78,28 @@ export const NtosMain = (props, context) => {
                   }
                   onClick={() => act('PC_Imprint_ID', { name: 'ID' })}
                 />
-              </>
-            }>
-            <Table>
-              <Table.Row>
-                ID Name: {login.IDName} ({proposed_login.IDName})
-              </Table.Row>
-              <Table.Row>
-                Assignment: {login.IDJob} ({proposed_login.IDJob})
-              </Table.Row>
-            </Table>
-          </Section>
-        )}
+              )}
+            </>
+          }>
+          <Table>
+            <Table.Row>
+              ID Name:{' '}
+              {show_imprint
+                ? login.IDName +
+                ' ' +
+                (proposed_login.IDName ? '(' + proposed_login.IDName + ')' : '')
+                : proposed_login.IDName ?? ''}
+            </Table.Row>
+            <Table.Row>
+              Assignment:{' '}
+              {show_imprint
+                ? login.IDJob +
+                ' ' +
+                (proposed_login.IDJob ? '(' + proposed_login.IDJob + ')' : '')
+                : proposed_login.IDJob ?? ''}
+            </Table.Row>
+          </Table>
+        </Section>
         {!!pai && (
           <Section title="pAI">
             <Table>