diff --git a/src/sbbs3/atcodes.cpp b/src/sbbs3/atcodes.cpp
index 6ca8cd0a4c783c69496f8f474c23b1ec8b648a3c..d73e2ed2235d65107bd2bab5471f48335cb4375d 100644
--- a/src/sbbs3/atcodes.cpp
+++ b/src/sbbs3/atcodes.cpp
@@ -957,6 +957,9 @@ const char* sbbs_t::atcode(const char* sp, char* str, size_t maxlen, int* pmode,
 	if(!strcmp(sp,"USER") || !strcmp(sp,"ALIAS") || !strcmp(sp,"NAME"))
 		return(useron.alias);
 
+	if(strcmp(sp, "NODE_USER") == 0)
+		return thisnode.misc&NODE_ANON ? text[UNKNOWN_USER] : useron.alias;
+
 	if(!strcmp(sp,"FIRST")) {
 		safe_snprintf(str,maxlen,"%s",useron.alias);
 		tp=strchr(str,' ');