Merge branch 'test/abc' into test/abc2

# Conflicts:
#	README.md

README.md

@@ -109,6 +109,7 @@ See a complete [architecture overview](https://docs.netbird.io/about-netbird/how
 -  [NetBird installer script](https://github.com/physk/netbird-installer)
 -  [NetBird ansible collection by Dominion Solutions](https://galaxy.ansible.com/ui/repo/published/dominion_solutions/netbird/)
 
+
 **Note**: The `main` branch may be in an *unstable or even broken state* during development.
 For stable versions, see [releases](https://github.com/netbirdio/netbird/releases).
 
@@ -123,4 +124,7 @@ We use open-source technologies like [WireGuard®](https://www.wireguard.com/),
 
 ### Legal
  _WireGuard_ and the _WireGuard_ logo are [registered trademarks](https://www.wireguard.com/trademark-policy/) of Jason A. Donenfeld.
-
+ 
+dddd
+ 
+ccc

management/server/account.go

@@ -1361,16 +1361,21 @@ func (am *DefaultAccountManager) removeUserFromCache(accountID, userID string) e
 func (am *DefaultAccountManager) updateAccountDomainAttributes(account *Account, claims jwtclaims.AuthorizationClaims,
 	primaryDomain bool,
 ) error {
-	account.IsDomainPrimaryAccount = primaryDomain
 
-	lowerDomain := strings.ToLower(claims.Domain)
+	if claims.Domain != "" {
-	userObj := account.Users[claims.UserId]
+		account.IsDomainPrimaryAccount = primaryDomain
-	if account.Domain != lowerDomain && userObj.Role == UserRoleAdmin {
+
-		account.Domain = lowerDomain
+		lowerDomain := strings.ToLower(claims.Domain)
-	}
+		userObj := account.Users[claims.UserId]
-	// prevent updating category for different domain until admin logs in
+		if account.Domain != lowerDomain && userObj.Role == UserRoleAdmin {
-	if account.Domain == lowerDomain {
+			account.Domain = lowerDomain
-		account.DomainCategory = claims.DomainCategory
+		}
+		// prevent updating category for different domain until admin logs in
+		if account.Domain == lowerDomain {
+			account.DomainCategory = claims.DomainCategory
+		}
+	} else {
+		log.Errorf("claims don't contain a valid domain, skipping domain attributes update. Received claims: %v", claims)
 	}
 
 	err := am.Store.SaveAccount(account)