diff --git a/src/d_clisrv.c b/src/d_clisrv.c
index 8af035d5c..815461f62 100644
--- a/src/d_clisrv.c
+++ b/src/d_clisrv.c
@@ -3576,8 +3576,8 @@ static void SV_GenContext(void)
 			server_context[i] = 'a'+(a-26);
 	}
 
-	strncpy(connectedservername, cv_servername.string, MAXSERVERNAME);
-	strncpy(connectedservercontact, cv_server_contact.string, MAXSERVERCONTACT);
+	CopyCaretColors(connectedservername, cv_servername.string, MAXSERVERNAME);
+	CopyCaretColors(connectedservercontact, cv_server_contact.string, MAXSERVERCONTACT);
 	strncpy(connectedserverdescription, DEFAULTDESCSTRING, MAXSERVERDESCRIPTION);
 }
 
diff --git a/src/mserv.c b/src/mserv.c
index 2e1e45cbc..ae1212891 100644
--- a/src/mserv.c
+++ b/src/mserv.c
@@ -509,8 +509,8 @@ Update_parameters (void)
 	// Lets update Clients on this info.
 	if (Playing() && server)
 	{
-		strncpy(connectedservername, cv_servername.string, MAXSERVERNAME);
-		strncpy(connectedservercontact, cv_server_contact.string, MAXSERVERCONTACT);
+		CopyCaretColors(connectedservername, cv_servername.string, MAXSERVERNAME);
+		CopyCaretColors(connectedservercontact, cv_server_contact.string, MAXSERVERCONTACT);
 
 		ServerInfoUpdateSend();
 	}