diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm
index cbe8e673c7d..8a6331b5d69 100644
--- a/code/game/objects/structures/crates_lockers/closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets.dm
@@ -524,13 +524,15 @@
 	for(var/atom/A in location)
 		if(A.density && A != src && A != AM)
 			transparent = TRUE
-			break
+			alpha = 180
+			update_icon()
+			return
+	alpha = 255
 	update_icon()
 
 /obj/structure/closet/bluespace/Crossed(atom/movable/AM, oldloc)
 	if(AM.density)
-		transparent = TRUE
-		update_icon()
+		UpdateTransparency(location = loc)
 
 /obj/structure/closet/bluespace/Move(NewLoc, direct) // Allows for "phasing" throug objects but doesn't allow you to stuff your EOC homebois in one of these and push them through walls.
 	var/turf/T = get_turf(NewLoc)
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/personal.dm b/code/game/objects/structures/crates_lockers/closets/secure/personal.dm
index 6e2cb4db730..d63ed5eba74 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/personal.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/personal.dm
@@ -39,10 +39,6 @@
 	if(opened || !istype(W, /obj/item/card/id))
 		return ..()
 
-	if(broken)
-		to_chat(user, "<span class='warning'>It appears to be broken.</span>")
-		return
-
 	if(istype(W, /obj/item/card/id/guest))
 		to_chat(user, "<span class='warning'>Invalid identification card.</span>")
 		return
@@ -51,24 +47,16 @@
 	if(!I || !I.registered_name)
 		return
 
-	if(src == user.loc)
-		to_chat(user, "<span class='notice'>You can't reach the lock from inside.</span>")
-
 	else if(allowed(user) || !registered_name || (istype(I) && (registered_name == I.registered_name)))
-		cut_overlays()
-
 		//they can open all lockers, or nobody owns this, or they own this locker
-		locked = !locked
-		if(locked)
-			add_overlay("locked")
-		else
-			add_overlay("unlocked")
-			icon_state = icon_closed
+		togglelock(user)
+		if(!locked)
 			registered_name = null
 			desc = initial(desc)
 
 		if(!registered_name && locked)
 			registered_name = I.registered_name
-			desc = "Owned by [I.registered_name]."
+			desc = "Owned by [I.registered_name]." 
+
 	else
 		to_chat(user, "<span class='warning'>Access denied.</span>")