diff --git a/src/sbbs3/answer.cpp b/src/sbbs3/answer.cpp
index f6883e5edfe83699e8e15052b746bef199054bc9..f1130423e81c182cbccfea2cb3f2d2c49c4f651b 100644
--- a/src/sbbs3/answer.cpp
+++ b/src/sbbs3/answer.cpp
@@ -373,7 +373,6 @@ bool sbbs_t::answer()
 		else
 			SAFECOPY(terminal,"DUMB");
 	}
-	update_nodeterm();
 
 	/* AutoLogon via IP or Caller ID here */
 	if(!useron.number && !(sys_status&SS_RLOGIN)
@@ -459,6 +458,8 @@ bool sbbs_t::answer()
 	SAFECOPY(client_ipaddr, cid);	/* Over-ride IP address with Caller-ID info */
 	SAFECOPY(useron.comp,client_name);
 
+	update_nodeterm();
+
 	if(!useron.number 
 		&& rlogin_name[0]!=0 
 		&& !(cfg.sys_misc&SM_CLOSED)