diff --git a/management/server/peer.go b/management/server/peer.go
index b3408acd6..088b2e41d 100644
--- a/management/server/peer.go
+++ b/management/server/peer.go
@@ -201,20 +201,21 @@ func (am *DefaultAccountManager) UpdatePeer(accountID string, update *Peer) (*Pe
 		return nil, err
 	}
 
-	if peer.Name != "" {
-		peer.Name = update.Name
-	}
 	peer.SSHEnabled = update.SSHEnabled
 
-	existingLabels := account.getPeerDNSLabels()
+	if peer.Name != update.Name {
+		peer.Name = update.Name
 
-	newLabel, err := getPeerHostLabel(peer.Name, existingLabels)
-	if err != nil {
-		return nil, err
+		existingLabels := account.getPeerDNSLabels()
+
+		newLabel, err := getPeerHostLabel(peer.Name, existingLabels)
+		if err != nil {
+			return nil, err
+		}
+
+		peer.DNSLabel = newLabel
 	}
 
-	peer.DNSLabel = newLabel
-
 	account.UpdatePeer(peer)
 
 	err = am.Store.SaveAccount(account)