diff --git a/exec/newuser.js b/exec/newuser.js
index 7f064f6cdb20372a487f39f73355a9c34fa36034..646b04c112d46991fbd8921257afd47a4ff16dfb 100644
--- a/exec/newuser.js
+++ b/exec/newuser.js
@@ -145,6 +145,7 @@ function send_newuser_welcome_msg(fname)
 		subject: "Welcome to " + system.name + "!" 
 	};
 
+	msgtxt = msgtxt.replace(/@(\w+)@/, function (code) { return bbs.atcode(code); });
 	var result = msgbase.save_msg(hdr, msgtxt);
 	if(!result)
 		log(LOG_ERR, "!ERROR " + msgbase.error + " saving mail message");