From 5393ad948f91c3d4b9d6c011b2712517733d17ca Mon Sep 17 00:00:00 2001
From: Pascal Fischer <32096965+pascal-fischer@users.noreply.github.com>
Date: Wed, 7 Jan 2026 13:05:39 +0100
Subject: [PATCH] [management] fix nil handling for extra settings (#5049)

---
 management/server/account.go | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/management/server/account.go b/management/server/account.go
index 52dcc567e..a1046432a 100644
--- a/management/server/account.go
+++ b/management/server/account.go
@@ -333,8 +333,9 @@ func (am *DefaultAccountManager) UpdateAccountSettings(ctx context.Context, acco
 			}
 		}
 
-		newSettings.Extra.IntegratedValidatorGroups = oldSettings.Extra.IntegratedValidatorGroups
-		newSettings.Extra.IntegratedValidator = oldSettings.Extra.IntegratedValidator
+		if newSettings.Extra == nil {
+			newSettings.Extra = oldSettings.Extra
+		}
 
 		if err = transaction.SaveAccountSettings(ctx, accountID, newSettings); err != nil {
 			return err