diff --git a/code/game/objects/items/devices/paicard.dm b/code/game/objects/items/devices/paicard.dm
index 7c5c7e4a09f..0db5724b527 100644
--- a/code/game/objects/items/devices/paicard.dm
+++ b/code/game/objects/items/devices/paicard.dm
@@ -233,7 +233,7 @@
 		return
 
 	if(pai)
-		if(!in_range(src, U) || pai.canmove || pai.resting)
+		if(!in_range(src, U))
 			U << browse(null, "window=paicard")
 			usr.unset_machine()
 			return
diff --git a/code/modules/mob/living/silicon/pai/software.dm b/code/modules/mob/living/silicon/pai/software.dm
index 4b657bb3181..ef36f5b94c9 100644
--- a/code/modules/mob/living/silicon/pai/software.dm
+++ b/code/modules/mob/living/silicon/pai/software.dm
@@ -92,8 +92,8 @@ var/global/list/default_pai_software = list()
 		ui.set_auto_update(1)
 
 /mob/living/silicon/pai/Topic(href, href_list)
-	. = ..()
-	if(.) return
+	if(..())
+		return 1
 
 	if(href_list["software"])
 		var/soft = href_list["software"]