diff --git a/server/client.go b/server/client.go
index 1d889fad..9670fd58 100644
--- a/server/client.go
+++ b/server/client.go
@@ -610,12 +610,15 @@ func (c *client) initClient() {
 			if conn = addr.String(); conn != _EMPTY_ {
 				host, port, _ := net.SplitHostPort(conn)
 				iPort, _ := strconv.Atoi(port)
-				c.port = uint16(iPort)
+				c.host, c.port = host, uint16(iPort)
 				if c.isWebsocket() && c.ws.clientIP != _EMPTY_ {
-					c.host = c.ws.clientIP
-					conn = net.JoinHostPort(c.host, port)
-				} else {
-					c.host = host
+					cip := c.ws.clientIP
+					// Surround IPv6 addresses with square brackets, as
+					// net.JoinHostPort would do...
+					if strings.Contains(cip, ":") {
+						cip = "[" + cip + "]"
+					}
+					conn = fmt.Sprintf("%s/%s", cip, conn)
 				}
 				// Now that we have extracted host and port, escape
 				// the string because it is going to be used in Sprintf
diff --git a/server/websocket_test.go b/server/websocket_test.go
index 600f7de6..f3ea54e0 100644
--- a/server/websocket_test.go
+++ b/server/websocket_test.go
@@ -3989,12 +3989,12 @@ func TestWSXForwardedFor(t *testing.T) {
 			}
 			select {
 			case d := <-l.ch:
-				ipAndColumn := fmt.Sprintf("%s:", test.expectedValue)
+				ipAndSlash := fmt.Sprintf("%s/", test.expectedValue)
 				if test.useHdrValue {
-					if !strings.HasPrefix(d, ipAndColumn) {
-						t.Fatalf("Expected debug statement to start with: %q, got %q", ipAndColumn, d)
+					if !strings.HasPrefix(d, ipAndSlash) {
+						t.Fatalf("Expected debug statement to start with: %q, got %q", ipAndSlash, d)
 					}
-				} else if strings.HasPrefix(d, ipAndColumn) {
+				} else if strings.HasPrefix(d, ipAndSlash) {
 					t.Fatalf("Unexpected debug statement: %q", d)
 				}
 			case <-time.After(time.Second):