diff --git a/Code/Machinery/Computer/card.dm b/Code/Machinery/Computer/card.dm
index 10993ba..0ca73fd 100644
--- a/Code/Machinery/Computer/card.dm
+++ b/Code/Machinery/Computer/card.dm
@@ -142,7 +142,7 @@ obj/machinery/computer/card
 					d1 = "[stars(modify.name)] :<BR>\n[stars("General Access Level:")] [vo]<BR>\n[stars("Laboratory Access:")] [vl]<BR>\n[stars("Reactor/Engine Access:")] [ve]<BR>\n[stars("Main Systems Access:")] [va]<BR>\n[stars("Registered:")] <A href='?src=\ref[src];reg=1'>[src.modify.registered ? stars(src.modify.registered) : stars("{None: Click to modify}")]</A><BR>\n[stars("Assignment:")] [src.modify.assignment ? "[stars(src.modify.assignment)]" : "None"]<BR>\n[assign]<BR>"
 
 
-			if (istype(user, /mob/human))
+			if (istype(user, /mob/human) || istype(user, /mob/ai))
 				dat = text("<TT><B>Identification Card Modifier</B><BR>\n<I>Please Insert the cards into the slots</I><BR>\nTarget: <A href='?src=\ref[];modify=1'>[]</A><BR>\nConfirm Identity: <A href='?src=\ref[];scan=1'>[]</A><BR>\n-----------------<BR>\n[]<BR>\n<BR>\n<BR>\n<A href='?src=\ref[];mode=1'>Access Crew Manifest</A><BR>\n</TT>", src, (src.modify ? text("[]", src.modify.name) : "----------"), src, (src.scan ? text("[]", src.scan.name) : "----------"), d1, src)
 			else
 				dat = text("<TT><B>[]</B><BR>\n<I>[]</I><BR>\n[] <A href='?src=\ref[];modify=1'>[]</A><BR>\n[] <A href='?src=\ref[];scan=1'>[]</A><BR>\n-----------------<BR>\n[]<BR>\n<BR>\n<BR>\n<A href='?src=\ref[];mode=1'>[]</A><BR>\n</TT>", stars("Identification Card Modifier"), stars("Please Insert the cards into the slots"), stars("Target:"), src, (src.modify ? text("[]", stars(src.modify.name)) : "----------"), stars("Confirm Identity:"), src, (src.scan ? text("[]", stars(src.scan.name)) : "----------"), d1, src, stars("Access Crew Manifest"))
@@ -197,15 +197,16 @@ obj/machinery/computer/card
 						src.scan = I
 				src.authenticated = 0
 
-			if ((!( src.authenticated ) && (src.scan || (istype(usr, /mob/ai))) && (src.modify || src.mode)))
-				if (istype(usr, /mob/ai))
-					src.authenticated = 1
-				else
-					if ((src.scan.assignment == "Captain" || src.scan.assignment == "Head of Personnel"))
+			if (href_list["auth"])
+				if ((!( src.authenticated ) && (src.scan || (istype(usr, /mob/ai))) && (src.modify || src.mode)))
+					if (istype(usr, /mob/ai))
 						src.authenticated = 1
-			else
-				if ((!( src.authenticated ) && (istype(usr, /mob/ai))) && (!src.modify))
-					usr << "You can't modify an ID without an ID inserted to modify. Once one is in the modify slot on the computer, you can log in."
+					else
+						if ((src.scan.assignment == "Captain" || src.scan.assignment == "Head of Personnel"))
+							src.authenticated = 1
+				else if (!href_list["print"])
+					if ((!( src.authenticated ) && (istype(usr, /mob/ai))) && (!src.modify))
+						usr << "You can't modify an ID without an ID inserted to modify. Once one is in the modify slot on the computer, you can log in."
 			
 			if (href_list["vo"])
 				if (src.authenticated)
diff --git a/Code/Machinery/Computer/med_data.dm b/Code/Machinery/Computer/med_data.dm
index eaa829b..1b0d3cb 100644
--- a/Code/Machinery/Computer/med_data.dm
+++ b/Code/Machinery/Computer/med_data.dm
@@ -32,7 +32,7 @@ obj/machinery/computer/med_data
 
 	// AI interact
 	attack_ai(mob/user)
-		return src.attack_ai(user)
+		return src.attack_hand(user)
 
 	// Human interact
 	// Show interaction window
diff --git a/Code/Machinery/Computer/secure_data.dm b/Code/Machinery/Computer/secure_data.dm
index 5cad223..a34e29c 100644
--- a/Code/Machinery/Computer/secure_data.dm
+++ b/Code/Machinery/Computer/secure_data.dm
@@ -32,7 +32,7 @@ obj/machinery/computer/secure_data
 
 	// AI interact
 	attack_ai(mob/user)
-		return src.attack_ai(user)
+		return src.attack_hand(user)
 
 	// Human interact, display window
 
diff --git a/Code/Machinery/cryocell.dm b/Code/Machinery/cryocell.dm
index 15efe26..9d732d1 100644
--- a/Code/Machinery/cryocell.dm
+++ b/Code/Machinery/cryocell.dm
@@ -225,7 +225,7 @@ obj/machinery/cryo_cell
 
 	// AI interact
 	attack_ai(mob/user)
-		return src.attack_ai(user)
+		return src.attack_hand(user)
 	
 	// Human interact, show status window of machine and occupant
 	
diff --git a/Code/Machinery/freezer.dm b/Code/Machinery/freezer.dm
index 0d6064b..424a925 100644
--- a/Code/Machinery/freezer.dm
+++ b/Code/Machinery/freezer.dm
@@ -102,7 +102,7 @@ obj/machinery/freezer
 	
 	// AI interact
 	attack_ai(mob/user)
-		return src.attack_ai(user)
+		return src.attack_hand(user)
 
 	// Interact by human
 	// Show the interaction window
diff --git a/Code/Machinery/sleeper.dm b/Code/Machinery/sleeper.dm
index 0cb59d9..e2b623a 100644
--- a/Code/Machinery/sleeper.dm
+++ b/Code/Machinery/sleeper.dm
@@ -244,7 +244,7 @@ obj/machinery/computer/sleep_console
 	
 	// AI interact
 	attack_ai(mob/user)
-		return src.attack_ai(user)
+		return src.attack_hand(user)
 
 	// Human interact
 	// Show the interaction window
diff --git a/Code/globals.dm b/Code/globals.dm
index bb1f097..39355d8 100644
--- a/Code/globals.dm
+++ b/Code/globals.dm
@@ -149,6 +149,8 @@ var
 </li><li>Prox bombs and timer bombs count for the traitor fully-heated-plasma-bomb objective now.
 </li><li>In nuclear mode, there is now a 25% chance of the AI being loyal to the syndicate instead of SS13. (The SS13 personnel won't know it)
 </li><li>There are now 24 solar panels at north solar, which is the same number that main solar (southwest) has (there were 12 at north solar before).
+</li><li>Fixed several places (everywhere I did it) where I typo'd in an infinite loop in attack_ai calling itself when it should have been calling attack_hand instead.
+</li><li>Fixed some more errors in the computers that crept in while I was merging them through the reorganizations.
 </ul>
 
 <p><B>Version 40.93.2H9.6</B>