From c0134600307769bc8635d3321629515bc769a8a5 Mon Sep 17 00:00:00 2001
From: jvcalderon <jose@budibase.com>
Date: Mon, 24 Mar 2025 15:46:24 +0100
Subject: [PATCH 1/3] Solves wrong user/creator calculation on app init

---
 packages/backend-core/src/users/db.ts | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/backend-core/src/users/db.ts b/packages/backend-core/src/users/db.ts
index 677feed678..ac3c9e30ab 100644
--- a/packages/backend-core/src/users/db.ts
+++ b/packages/backend-core/src/users/db.ts
@@ -261,9 +261,13 @@ export class UserDB {
       }
     }
 
-    const change = dbUser ? 0 : 1 // no change if there is existing user
-
+    let change = 1
     let creatorsChange = 0
+    if (opts.isAccountHolder || dbUser) {
+      change = 0
+      creatorsChange = 1
+    }
+
     if (dbUser) {
       const [isDbUserCreator, isUserCreator] = await creatorsInList([
         dbUser,

From 5c03a38b441fe4274b8ffda670e1412e2cfb7268 Mon Sep 17 00:00:00 2001
From: Sam Rose <hello@samwho.dev>
Date: Mon, 24 Mar 2025 16:54:05 +0000
Subject: [PATCH 2/3] Update pro reference.

---
 packages/pro | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/pro b/packages/pro
index 2991addf93..761ec71e15 160000
--- a/packages/pro
+++ b/packages/pro
@@ -1 +1 @@
-Subproject commit 2991addf939f2b6fb1a258616056f2931348c09b
+Subproject commit 761ec71e1543ef04887d6515f99a2c2911999ebf

From 8592ca82ac0153096e06995d9ad5bf5781a2df10 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Tue, 25 Mar 2025 11:29:39 +0100
Subject: [PATCH 3/3] Display new in picker if oauth2 enabled

---
 .../builder/src/components/integration/rest/AuthPicker.svelte   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/builder/src/components/integration/rest/AuthPicker.svelte b/packages/builder/src/components/integration/rest/AuthPicker.svelte
index f7a0bf0eb9..e8bf25d9ce 100644
--- a/packages/builder/src/components/integration/rest/AuthPicker.svelte
+++ b/packages/builder/src/components/integration/rest/AuthPicker.svelte
@@ -65,7 +65,7 @@
 </script>
 
 <DetailPopover bind:this={popover} {title} align={PopoverAlignment.Right}>
-  <div slot="anchor" class:display-new={!authConfig}>
+  <div slot="anchor" class:display-new={!authConfig && oauth2Enabled}>
     <ActionButton icon="LockClosed" quiet selected>
       {#if !authConfig}
         Authentication