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