diff --git a/code/game/machinery/computer/card.dm b/code/game/machinery/computer/card.dm
index 4e7dd4e28cf..92c642a3495 100644
--- a/code/game/machinery/computer/card.dm
+++ b/code/game/machinery/computer/card.dm
@@ -372,17 +372,20 @@ var/time_last_changed_position = 0
else if (modify && !mode)
P.name = "access report"
P.info = {"
Access Report
- Prepared By: [scan.registered_name ? scan.registered_name : "Unknown"]
+ Prepared By: [scan && scan.registered_name ? scan.registered_name : "Unknown"]
For: [modify.registered_name ? modify.registered_name : "Unregistered"]
Assignment: [modify.assignment]
Account Number: #[modify.associated_account_number]
Blood Type: [modify.blood_type]
- Access:
+ Access:
"}
+ var/first = 1
for(var/A in modify.access)
- P.info += " [get_access_desc(A)]"
+ P.info += "[first ? "" : ", "][get_access_desc(A)]"
+ first = 0
+ P.info += "
"
if ("terminate")
if (is_authenticated(usr))