diff --git a/src/sbbs3/answer.cpp b/src/sbbs3/answer.cpp
index 908ab3fe4ca9dbf33ead9bf1f89a5c06351a6c93..386af6f551d9b9ff350c8e72dc3ada878c1620a2 100644
--- a/src/sbbs3/answer.cpp
+++ b/src/sbbs3/answer.cpp
@@ -431,6 +431,7 @@ bool sbbs_t::answer()
 		} else {
 			if(telnet_location[0]) {			/* Telnet Location info provided */
 				lprintf(LOG_INFO, "Telnet Location: %s", telnet_location);
+				SAFECOPY(cid, telnet_location);
 			}
 		}
 		if(telnet_speed) {