diff --git a/management/server/dns.go b/management/server/dns.go
index 7d8ac006d..fa62a0d4a 100644
--- a/management/server/dns.go
+++ b/management/server/dns.go
@@ -153,9 +153,7 @@ func (am *DefaultAccountManager) SaveDNSSettings(ctx context.Context, accountID
 		am.StoreEvent(ctx, userID, accountID, accountID, activity.GroupRemovedFromDisabledManagementGroups, meta)
 	}
 
-	updateAccountPeers := (areGroupChangesAffectPeers(account, addedGroups) && anyGroupHasPeers(account, addedGroups)) ||
-		areGroupChangesAffectPeers(account, removedGroups) && anyGroupHasPeers(account, removedGroups)
-	if updateAccountPeers {
+	if anyGroupHasPeers(account, addedGroups) || anyGroupHasPeers(account, removedGroups) {
 		am.updateAccountPeers(ctx, account)
 	}
 
diff --git a/management/server/peer.go b/management/server/peer.go
index be58ae684..7e8dbe1a6 100644
--- a/management/server/peer.go
+++ b/management/server/peer.go
@@ -185,7 +185,9 @@ func (am *DefaultAccountManager) UpdatePeer(ctx context.Context, accountID, user
 		am.StoreEvent(ctx, userID, peer.IP.String(), accountID, event, peer.EventMeta(am.GetDNSDomain()))
 	}
 
-	if peer.Name != update.Name {
+	peerLabelUpdated := peer.Name != update.Name
+
+	if peerLabelUpdated {
 		peer.Name = update.Name
 
 		existingLabels := account.getPeerDNSLabels()
@@ -226,7 +228,8 @@ func (am *DefaultAccountManager) UpdatePeer(ctx context.Context, accountID, user
 	}
 
 	expired, _ := peer.LoginExpired(account.Settings.PeerLoginExpiration)
-	if expired && peer.LoginExpirationEnabled {
+
+	if peerLabelUpdated || (expired && peer.LoginExpirationEnabled) {
 		am.updateAccountPeers(ctx, account)
 	}