diff --git a/protocol/signed_handshake_done.go b/protocol/signed_handshake_done.go
index 6d4d004..c4b25f4 100644
--- a/protocol/signed_handshake_done.go
+++ b/protocol/signed_handshake_done.go
@@ -116,14 +116,18 @@ func (h HandshakeDone) HandleMessage(message IncomingMessageDataSigned) error {
 		return nil
 	}
 
-	peer.SetConnectionURIs(h.connectionUris)
-
 	peerId, err := peer.Id().ToString()
 
 	if err != nil {
 		return err
 	}
 
+	for _, uri := range h.connectionUris {
+		uri.User = url.User(peerId)
+	}
+
+	peer.SetConnectionURIs(h.connectionUris)
+
 	logger.Info(fmt.Sprintf("[+] %s (%s)", peerId, peer.RenderLocationURI()))
 
 	err = mediator.ConnectToNode([]*url.URL{h.connectionUris[0]}, false, peer)