From 9beecf7d69a0eb68880b32c6e5b73a7a5530d4a4 Mon Sep 17 00:00:00 2001
From: "Theodor S. Midtlien" <theodor@midtlien.com>
Date: Fri, 18 Sep 2026 17:15:07 +0200
Subject: [PATCH] Move disable default auto claim check

---
 client/internal/profilemanager/service.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/internal/profilemanager/service.go b/client/internal/profilemanager/service.go
index b2a2b9984..dcdb5ab72 100644
--- a/client/internal/profilemanager/service.go
+++ b/client/internal/profilemanager/service.go
@@ -652,7 +652,7 @@ func (s *ServiceManager) ClaimLegacyProfiles(id ipcauth.Identity) {
 }
 
 func (s *ServiceManager) ClaimDefaultProfileIfNeeded(id ipcauth.Identity) {
-	if !id.Known() || ipcauth.IsPrivilegedCaller(id) {
+	if !id.Known() || ipcauth.IsPrivilegedCaller(id) || !defaultProfileClaimDisabled() {
 		return
 	}
 
@@ -672,7 +672,7 @@ func (s *ServiceManager) ClaimDefaultProfileIfNeeded(id ipcauth.Identity) {
 		}
 	}
 
-	if unowned && !defaultProfileClaimDisabled() && isConsoleUser(id) {
+	if unowned && isConsoleUser(id) {
 		principal := ipcauth.OwnerPrincipalForIdentity(id)
 		parsed, ok := ipcauth.ParsePrincipal(principal)
 		if !ok {