diff --git a/exec/automsg.js b/exec/automsg.js
index a29346591c257149e0d044012d50c524d46c3c28..b7d6688ed6ba37fa6fbcf54b1d48efcecccb0325 100644
--- a/exec/automsg.js
+++ b/exec/automsg.js
@@ -11,7 +11,7 @@ function automsg()
 {
 	const quote_fmt=" > %.*s\r\n";
 	var automsg = system.data_dir + "msgs/auto.msg";
-	while(bbs.online && !js.termiated) {
+	while(bbs.online && !js.termiated && !console.aborted) {
 		bbs.nodesync();
 		console.mnemonics(bbs.text(AutoMsg));
 		switch(console.getkeys("RWQD",0)) {
@@ -20,7 +20,7 @@ function automsg()
 				break;
 			case 'W':
 				if(user.security.restrictions&UFLAG_W) {
-					console.print(bbs.text[R_AutoMsg]);
+					console.print(bbs.text(R_AutoMsg));
 					break;
 				}
 				bbs.action=NODE_AMSG;