diff --git a/src/sbbs3/atcodes.cpp b/src/sbbs3/atcodes.cpp
index 360a67ae948f68ff7534e45c90191e8702001d85..4e0acd3a9b74221b768c8d883d2ad440337ef1fc 100644
--- a/src/sbbs3/atcodes.cpp
+++ b/src/sbbs3/atcodes.cpp
@@ -136,8 +136,9 @@ int sbbs_t::atcodes(char *instr)
 			bputs(faddrtoa(cfg.faddr[0]));
 	}
 
-	else if(!strcmp(sp,"MAILADDR")) 
-		bputs(usermailaddr(&cfg, str, useron.zipcode));
+	else if(!strcmp(sp,"EMAILADDR")) 
+		bputs(usermailaddr(&cfg, str
+			,cfg.inetmail_misc&NMAIL_ALIAS ? useron.alias : useron.name));
 
 	else if(!strcmp(sp,"QWKID"))
 		bputs(cfg.sys_id);