diff --git a/unix/vncviewer/CConn.cxx b/unix/vncviewer/CConn.cxx
index 7983cdf..f93a3d6 100644
--- a/unix/vncviewer/CConn.cxx
+++ b/unix/vncviewer/CConn.cxx
@@ -116,7 +116,7 @@
 
   sameMachine = sock->sameMachine();
   sock->inStream().setBlockCallback(this);
-  setServerName(sock->getPeerEndpoint());
+  setServerName(serverHost);
   setStreams(&sock->inStream(), &sock->outStream());
   initialiseProtocol();
 }
diff --git a/win/vncviewer/CConn.cxx b/win/vncviewer/CConn.cxx
index b34b56e..3585966 100644
--- a/win/vncviewer/CConn.cxx
+++ b/win/vncviewer/CConn.cxx
@@ -90,9 +90,10 @@
 bool CConn::initialise(network::Socket* s, bool reverse) {
   // Set the server's name for MRU purposes
   CharArray endpoint(s->getPeerEndpoint());
-  setServerName(endpoint.buf);
+
   if (!options.host.buf)
     options.setHost(endpoint.buf);
+  setServerName(options.host.buf);
 
   // Initialise the underlying CConnection
   setStreams(&s->inStream(), &s->outStream());