diff --git a/socketserver/server/commands.go b/socketserver/server/commands.go
index 6bb3ca5f..6f67fe4e 100644
--- a/socketserver/server/commands.go
+++ b/socketserver/server/commands.go
@@ -136,9 +136,11 @@ func C2SHello(conn *websocket.Conn, client *ClientInfo, msg ClientMessage) (rmsg
 		if client.ClientID == uuid.Nil {
 			client.ClientID = uuid.NewV4()
 		}
-	} else if _, ok := ary[1].(bool); (ok || ary[1] == nil) {
+	} else if _, ok := ary[1].(bool); ok {
 		// opt out
 		client.ClientID = AnonymousClientID
+	} else if ary[1] == nil {
+		client.ClientID = uuid.NewV4()
 	} else {
 		err = ErrExpectedTwoStrings
 		return