diff --git a/code/game/objects/structures/crates_lockers/closets/coffin.dm b/code/game/objects/structures/crates_lockers/closets/coffin.dm
index 86195d140f0..934f5feced7 100644
--- a/code/game/objects/structures/crates_lockers/closets/coffin.dm
+++ b/code/game/objects/structures/crates_lockers/closets/coffin.dm
@@ -32,7 +32,7 @@
 
 /obj/structure/closet/coffin/vampire/Initialize(mapload, mob/user)
 	. = ..()
-	name = "\proper the coffin of [user]"
+	name = "\proper the coffin of [user.mind.name]"
 	desc += "<br>This coffin's owner may not actually have been dear to anyone, or even departed quite yet.<br>\
 		<span class='warning'>It appears impervious to everything but lasers and fire! Especially fire!</span>"
 	vampire = user
diff --git a/code/modules/antagonists/vampire/vampire_powers/vampire_powers.dm b/code/modules/antagonists/vampire/vampire_powers/vampire_powers.dm
index 8260c447164..98d7698bc15 100644
--- a/code/modules/antagonists/vampire/vampire_powers/vampire_powers.dm
+++ b/code/modules/antagonists/vampire/vampire_powers/vampire_powers.dm
@@ -252,7 +252,8 @@
 	qdel(C)
 	var/datum/antagonist/vampire/V = user.mind.has_antag_datum(/datum/antagonist/vampire)
 	V.has_lair = TRUE
-	user.mind.RemoveSpell(src)
+	V.upgrade_tiers -= type
+	V.remove_ability(src)
 
 /obj/effect/lair_rune
 	mouse_opacity = MOUSE_OPACITY_TRANSPARENT