diff --git a/src/sbbs3/atcodes.cpp b/src/sbbs3/atcodes.cpp
index d73e2ed2235d65107bd2bab5471f48335cb4375d..ffe93da8080208e142ac5d23833e370b877bb225 100644
--- a/src/sbbs3/atcodes.cpp
+++ b/src/sbbs3/atcodes.cpp
@@ -938,6 +938,9 @@ const char* sbbs_t::atcode(const char* sp, char* str, size_t maxlen, int* pmode,
 
 	/* LASTCALL */
 
+	if(strcmp(sp, "NODE_USER") == 0)
+		return thisnode.misc&NODE_ANON ? text[UNKNOWN_USER] : useron.alias;
+
 	if(!strncmp(sp,"NODE",4)) {
 		i=atoi(sp+4);
 		if(i && i<=cfg.sys_nodes) {
@@ -957,9 +960,6 @@ 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,' ');