diff --git a/code/modules/flufftext/Dreaming.dm b/code/modules/flufftext/Dreaming.dm
index a24b73ae56c..4cdb2f88f07 100644
--- a/code/modules/flufftext/Dreaming.dm
+++ b/code/modules/flufftext/Dreaming.dm
@@ -18,13 +18,13 @@
 /mob/living/carbon/proc/custom_dreams(list/dreamlist, mob/user)
 	var/list/newlist = dreamlist.Copy()
 	for(var/i in 1 to newlist.len)
-		newlist[i] = replacetext(newlist[i], "\[DREAMER\]", "[user.name]")
+		newlist[i] = replacetext(newlist[i], "DREAMER", "[user.name]")
 	return newlist
 
 
 //NIGHTMARES
 /mob/living/carbon/proc/nightmare()
-	var/list/nightmares = GLOB.nightmare_strings.Copy()
+	var/list/nightmares = custom_dreams(GLOB.nightmare_strings, src)
 
 	for(var/obj/item/bedsheet/sheet in loc)
 		nightmares += sheet.nightmare_messages
diff --git a/config/names/dreams.txt b/config/names/dreams.txt
index 4bd2c2b984e..263b57ace12 100644
--- a/config/names/dreams.txt
+++ b/config/names/dreams.txt
@@ -109,4 +109,4 @@ the AI core
 the mining station
 the research station
 a beaker of strange liquid
-Captain [DREAMER]
+Captain DREAMER
diff --git a/config/names/nightmares.txt b/config/names/nightmares.txt
index 022a0494edd..a71f9d0ba84 100644
--- a/config/names/nightmares.txt
+++ b/config/names/nightmares.txt
@@ -25,4 +25,4 @@ aaaAAAaaaaAAAAAAaa
 pApErWork
 we SEE yoU
 the ceiling
-we have been waiting for you [DREAMER]
\ No newline at end of file
+we have been waiting for you DREAMER
\ No newline at end of file