diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm
index 4484ed1c645..e8fa4a030ff 100644
--- a/code/game/objects/structures/crates_lockers/closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets.dm
@@ -1057,7 +1057,7 @@ GLOBAL_LIST_EMPTY(roundstart_station_closets)
 		movable_parent.relay_container_resist_act(user, src)
 		return
 	if(!welded && !locked)
-		open()
+		open(user)
 		return
 
 	if(DOING_INTERACTION_WITH_TARGET(user, src))
diff --git a/code/game/objects/structures/crates_lockers/closets/bodybag.dm b/code/game/objects/structures/crates_lockers/closets/bodybag.dm
index 26d4f8ec76d..28c2b6030b3 100644
--- a/code/game/objects/structures/crates_lockers/closets/bodybag.dm
+++ b/code/game/objects/structures/crates_lockers/closets/bodybag.dm
@@ -235,11 +235,11 @@
 
 /obj/structure/closet/body_bag/before_open(mob/living/user, force)
 	if(pinned)
-		if(force)
+		if(force || !user || user.loc == src)
 			pinned.forceMove(drop_location())
-			return TRUE // force open
+			return TRUE // force open, no user, or we can't take the note out from inside
 		balloon_alert(user, "paper removed")
-		if(!user.put_in_inactive_hand(pinned) || pinned.loc == src)
+		if(!user.put_in_inactive_hand(pinned) && pinned.loc == src)
 			pinned.forceMove(drop_location())
 		return FALSE // blocked the open action
 	return TRUE