diff --git a/peer/cwtch_peer.go b/peer/cwtch_peer.go
index 02787a0..a013c94 100644
--- a/peer/cwtch_peer.go
+++ b/peer/cwtch_peer.go
@@ -344,13 +344,13 @@ func (cp *cwtchPeer) AddServer(serverSpecification string) error {
 		}
 
 		// Store the key bundle for the server so we can reconstruct a tofubundle invite
-		cp.SetAttribute(string(model.BundleType), serverSpecification)
+		cp.SetContactAttribute(onion, string(model.BundleType), serverSpecification)
 
 		// If we have gotten to this point we can assume this is a safe key bundle signed by the
 		// server with no conflicting keys. So we are going to publish all the keys
 		for k, v := range ab {
 			log.Debugf("Server (%v) has %v key %v", onion, k, v)
-			cp.SetAttribute(k, v)
+			cp.SetContactAttribute(onion, k, v)
 		}
 
 		return nil