diff --git a/exec/user_settings.js b/exec/user_settings.js
index 42937a0fede9c0eab8479b5fb984ab1d9e772806..6e689dc9ea592df8939b4a77c31bd55d9d0692c9 100644
--- a/exec/user_settings.js
+++ b/exec/user_settings.js
@@ -388,6 +388,8 @@ while(bbs.online && !js.terminated) {
 				thisuser.settings |= USER_AUTOTERM;
 				thisuser.settings &=
 					~(USER_ANSI | USER_RIP | USER_WIP | USER_HTML | USER_PETSCII | USER_UTF8);
+				if (user.number === thisuser.number)
+					thisuser.settings |= console.autoterm;
 			}
 			else if (!console.aborted)
 				thisuser.settings &= ~USER_AUTOTERM;
diff --git a/src/sbbs3/useredit.cpp b/src/sbbs3/useredit.cpp
index a988f2a1ed680139119c8dc0da405ab741ee077b..dc5dcf2d467508be44e907fcee1c52f8c1295b35 100644
--- a/src/sbbs3/useredit.cpp
+++ b/src/sbbs3/useredit.cpp
@@ -869,6 +869,8 @@ void sbbs_t::maindflts(user_t* user)
 				if(yesno(text[AutoTerminalQ])) {
 					user->misc |= AUTOTERM;
 					user->misc &= ~(ANSI|RIP|PETSCII|UTF8);
+					if(user == &useron)
+						user->misc |= autoterm;
 				}
 				else
 					user->misc &= ~AUTOTERM;