diff --git a/src/client/cl_main.c b/src/client/cl_main.c
index 97d947eec..ca9334239 100644
--- a/src/client/cl_main.c
+++ b/src/client/cl_main.c
@@ -2709,7 +2709,7 @@ void CL_PacketEvent(netadr_t from, msg_t *msg)
 
 	if (msg->cursize < 4)
 	{
-		Com_Printf("%s: Runt packet\n", NET_AdrToString(from));
+		Com_Printf("%s: Runt packet\n", NET_AdrToStringwPort(from));
 		return;
 	}
 
@@ -4150,7 +4150,7 @@ void CL_ServerInfoPacket(netadr_t from, msg_t *msg)
 		{
 			strncat(info, "\n", sizeof(info));
 		}
-		Com_Printf("%s: %s", NET_AdrToString(from), info);
+		Com_Printf("%s: %s", NET_AdrToStringwPort(from), info);
 	}
 }
 
diff --git a/src/client/cl_ui.c b/src/client/cl_ui.c
index 2915c5f58..cc5272d24 100644
--- a/src/client/cl_ui.c
+++ b/src/client/cl_ui.c
@@ -304,21 +304,21 @@ static void LAN_GetServerAddressString(int source, int n, char *buf, int buflen)
 	case AS_LOCAL:
 		if (n >= 0 && n < MAX_OTHER_SERVERS)
 		{
-			Q_strncpyz(buf, NET_AdrToString(cls.localServers[n].adr), buflen);
+			Q_strncpyz(buf, NET_AdrToStringwPort(cls.localServers[n].adr), buflen);
 			return;
 		}
 		break;
 	case AS_GLOBAL:
 		if (n >= 0 && n < MAX_GLOBAL_SERVERS)
 		{
-			Q_strncpyz(buf, NET_AdrToString(cls.globalServers[n].adr), buflen);
+			Q_strncpyz(buf, NET_AdrToStringwPort(cls.globalServers[n].adr), buflen);
 			return;
 		}
 		break;
 	case AS_FAVORITES:
 		if (n >= 0 && n < MAX_OTHER_SERVERS)
 		{
-			Q_strncpyz(buf, NET_AdrToString(cls.favoriteServers[n].adr), buflen);
+			Q_strncpyz(buf, NET_AdrToStringwPort(cls.favoriteServers[n].adr), buflen);
 			return;
 		}
 		break;
@@ -371,7 +371,7 @@ static void LAN_GetServerInfo(int source, int n, char *buf, int buflen)
 		Info_SetValueForKey(info, "game", server->game);
 		Info_SetValueForKey(info, "gametype", va("%i", server->gameType));
 		Info_SetValueForKey(info, "nettype", va("%i", server->netType));
-		Info_SetValueForKey(info, "addr", NET_AdrToString(server->adr));
+		Info_SetValueForKey(info, "addr", NET_AdrToStringwPort(server->adr));
 		Info_SetValueForKey(info, "sv_allowAnonymous", va("%i", server->allowAnonymous));
 		Info_SetValueForKey(info, "friendlyFire", va("%i", server->friendlyFire));                   // NERVE - SMF
 		Info_SetValueForKey(info, "maxlives", va("%i", server->maxlives));                           // NERVE - SMF