diff --git a/ctrl/text.dat b/ctrl/text.dat
index c99312ab08613a38881bcd46000fe8dd2f7a5e18..5aba4e96c5c88da5564faed55bfec8aab4144683 100644
--- a/ctrl/text.dat
+++ b/ctrl/text.dat
@@ -756,8 +756,8 @@
 "\1n\1m\r\nSending NetMail To: \1h%s\1n\1m (\1h%s\1n\1m)\r\n"\  619 NetMailing
 	"              From: \1h%s\1n\1m (\1h%s\1n\1m)\r\n"
 "Remove this sub-board from your new-scan list"         620 RemoveFromNewScanQ
-"\r\n~Sub-board, ~Group, or ~All: "                     621 SubGroupOrAll
-"\r\n~Directory, ~Library, or ~All: "                   622 DirLibOrAll
+"\r\n~Sub-board: @SUB@, ~Group: @GRP@, or ~All: "       621 SubGroupOrAll
+"\r\n~Directory: @DIR@, ~Library: @LIB@, or ~All: "     622 DirLibOrAll
 "\r\n\1_\1y\1hEnter path: "                                623 EnterPath
 "\r\nSearch and display extended information"           624 SearchExtendedQ
 "\r\nDisplay Subjects Only"                             625 DisplaySubjectsOnlyQ
diff --git a/src/sbbs3/text_defaults.c b/src/sbbs3/text_defaults.c
index 13a6d0712616705a3fda4fb502ff7c2a8d0352c2..9718bc6fe51c9ac05805293671e0275393a3c3b5 100644
--- a/src/sbbs3/text_defaults.c
+++ b/src/sbbs3/text_defaults.c
@@ -1035,9 +1035,10 @@ const char * const text_defaults[TOTAL_TEXT]={
 		"\x6d\x3a\x20\x01\x68\x25\x73\x01\x6e\x01\x6d\x20\x28\x01\x68\x25\x73\x01\x6e\x01\x6d\x29\x0d\x0a" // 619 NetMailing
 	,"\x52\x65\x6d\x6f\x76\x65\x20\x74\x68\x69\x73\x20\x73\x75\x62\x2d\x62\x6f\x61\x72\x64\x20\x66\x72\x6f\x6d\x20\x79\x6f\x75\x72\x20"
 		"\x6e\x65\x77\x2d\x73\x63\x61\x6e\x20\x6c\x69\x73\x74" // 620 RemoveFromNewScanQ
-	,"\x0d\x0a\x7e\x53\x75\x62\x2d\x62\x6f\x61\x72\x64\x2c\x20\x7e\x47\x72\x6f\x75\x70\x2c\x20\x6f\x72\x20\x7e\x41\x6c\x6c\x3a\x20" // 621 SubGroupOrAll
-	,"\x0d\x0a\x7e\x44\x69\x72\x65\x63\x74\x6f\x72\x79\x2c\x20\x7e\x4c\x69\x62\x72\x61\x72\x79\x2c\x20\x6f\x72\x20\x7e\x41\x6c\x6c\x3a"
-		"\x20" // 622 DirLibOrAll
+	,"\x0d\x0a\x7e\x53\x75\x62\x2d\x62\x6f\x61\x72\x64\x3a\x20\x40\x53\x55\x42\x40\x2c\x20\x7e\x47\x72\x6f\x75\x70\x3a\x20\x40\x47\x52"
+		"\x50\x40\x2c\x20\x6f\x72\x20\x7e\x41\x6c\x6c\x3a\x20" // 621 SubGroupOrAll
+	,"\x0d\x0a\x7e\x44\x69\x72\x65\x63\x74\x6f\x72\x79\x3a\x20\x40\x44\x49\x52\x40\x2c\x20\x7e\x4c\x69\x62\x72\x61\x72\x79\x3a\x20\x40"
+		"\x4c\x49\x42\x40\x2c\x20\x6f\x72\x20\x7e\x41\x6c\x6c\x3a\x20" // 622 DirLibOrAll
 	,"\x0d\x0a\x01\x5f\x01\x79\x01\x68\x45\x6e\x74\x65\x72\x20\x70\x61\x74\x68\x3a\x20" // 623 EnterPath
 	,"\x0d\x0a\x53\x65\x61\x72\x63\x68\x20\x61\x6e\x64\x20\x64\x69\x73\x70\x6c\x61\x79\x20\x65\x78\x74\x65\x6e\x64\x65\x64\x20\x69\x6e"
 		"\x66\x6f\x72\x6d\x61\x74\x69\x6f\x6e" // 624 SearchExtendedQ