diff --git a/management/server/peer.go b/management/server/peer.go
index 823fa59e3..33e8e2ff5 100644
--- a/management/server/peer.go
+++ b/management/server/peer.go
@@ -568,7 +568,7 @@ func (am *DefaultAccountManager) AddPeer(setupKey, userID string, peer *Peer) (*
 	takenIps := account.getTakenIPs()
 	existingLabels := account.getPeerDNSLabels()
 
-	newLabel, err := getPeerHostLabel(peer.Name, existingLabels)
+	newLabel, err := getPeerHostLabel(peer.Meta.Hostname, existingLabels)
 	if err != nil {
 		return nil, err
 	}