diff --git a/code/game/objects/items/bodybag.dm b/code/game/objects/items/bodybag.dm
index f90b4dd4ca0..b4ba67e4c29 100644
--- a/code/game/objects/items/bodybag.dm
+++ b/code/game/objects/items/bodybag.dm
@@ -87,10 +87,8 @@
 		return
 
 /obj/structure/closet/body_bag/relaymove(mob/user,direction)
-	if(user.stat)
-		return
 	if(src.loc != get_turf(src))
-		src.loc.relaymove(usr,direction)
+		src.loc.relaymove(user,direction)
 	else
 		..()
 
diff --git a/code/game/objects/structures/morgue.dm b/code/game/objects/structures/morgue.dm
index bd280787827..42ee6af2e3e 100644
--- a/code/game/objects/structures/morgue.dm
+++ b/code/game/objects/structures/morgue.dm
@@ -77,34 +77,44 @@
 				return
 	return
 
+
 /obj/structure/morgue/attack_hand(mob/user as mob)
 	if (src.connected)
-		for(var/atom/movable/A as mob|obj in src.connected.loc)
-			if (!( A.anchored ))
-				A.forceMove(src)
-		playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1)
-		qdel(src.connected)
-		src.connected = null
+		close()
 	else
-		playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1)
-		src.connected = new /obj/structure/m_tray( src.loc )
-		step(src.connected, src.dir)
-		src.connected.layer = OBJ_LAYER
-		var/turf/T = get_step(src, src.dir)
-		if (T.contents.Find(src.connected))
-			src.connected.connected = src
-			src.icon_state = "morgue0"
-			for(var/atom/movable/A as mob|obj in src)
-				A.forceMove(src.connected.loc)
-			src.connected.icon_state = "morguet"
-			src.connected.set_dir(src.dir)
-		else
-			qdel(src.connected)
-			src.connected = null
+		open()
 	src.add_fingerprint(user)
 	update()
 	return
 
+
+/obj/structure/morgue/proc/close()
+	for(var/atom/movable/A as mob|obj in src.connected.loc)
+		if (!( A.anchored ))
+			A.forceMove(src)
+	playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1)
+	qdel(src.connected)
+	src.connected = null
+
+
+/obj/structure/morgue/proc/open()
+	playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1)
+	src.connected = new /obj/structure/m_tray( src.loc )
+	step(src.connected, src.dir)
+	src.connected.layer = OBJ_LAYER
+	var/turf/T = get_step(src, src.dir)
+	if (T.contents.Find(src.connected))
+		src.connected.connected = src
+		src.icon_state = "morgue0"
+		for(var/atom/movable/A as mob|obj in src)
+			A.forceMove(src.connected.loc)
+		src.connected.icon_state = "morguet"
+		src.connected.set_dir(src.dir)
+	else
+		qdel(src.connected)
+		src.connected = null
+
+
 /obj/structure/morgue/attackby(P as obj, mob/user as mob)
 	if (istype(P, /obj/item/weapon/pen))
 		var/t = input(user, "What would you like the label to be?", text("[]", src.name), null)  as text
@@ -123,21 +133,8 @@
 /obj/structure/morgue/relaymove(mob/user as mob)
 	if (user.stat)
 		return
-	src.connected = new /obj/structure/m_tray( src.loc )
-	step(src.connected, EAST)
-	src.connected.layer = OBJ_LAYER
-	var/turf/T = get_step(src, EAST)
-	if (T.contents.Find(src.connected))
-		src.connected.connected = src
-		src.icon_state = "morgue0"
-		for(var/atom/movable/A as mob|obj in src)
-			A.forceMove(src.connected.loc)
-		src.connected.icon_state = "morguet"
-	else
-		qdel(src.connected)
-		src.connected = null
-	return
-
+	if (user in src.occupants)
+		open()
 
 /*
  * Morgue tray