diff --git a/static/js/index.js b/static/js/index.js
index a5eb17e..b80dd16 100644
--- a/static/js/index.js
+++ b/static/js/index.js
@@ -176,6 +176,10 @@ window.app = Vue.createApp({
         })
         this.settingsDialog.show = false
         await this.loadSettings()
+        // Reload user wallet to reflect castle wallet for super user
+        if (this.isSuperUser) {
+          await this.loadUserWallet()
+        }
       } catch (error) {
         LNbits.utils.notifyApiError(error)
       } finally {
diff --git a/templates/castle/index.html b/templates/castle/index.html
index faadb6a..9fadea4 100644
--- a/templates/castle/index.html
+++ b/templates/castle/index.html
@@ -17,7 +17,7 @@
             <p class="q-mb-none">Track expenses, receivables, and balances for the collective</p>
           </div>
           <div class="col-auto">
-            <q-btn flat round icon="account_balance_wallet" @click="showUserWalletDialog">
+            <q-btn v-if="!isSuperUser" flat round icon="account_balance_wallet" @click="showUserWalletDialog">
               <q-tooltip>Configure Your Wallet</q-tooltip>
             </q-btn>
             <q-btn v-if="isSuperUser" flat round icon="settings" @click="showSettingsDialog">
@@ -50,7 +50,7 @@
       </div>
     </q-banner>
 
-    <q-banner v-if="castleWalletConfigured && !userWalletConfigured" class="bg-orange text-white" rounded>
+    <q-banner v-if="castleWalletConfigured && !userWalletConfigured && !isSuperUser" class="bg-orange text-white" rounded>
       <template v-slot:avatar>
         <q-icon name="account_balance_wallet" color="white"></q-icon>
       </template>
@@ -106,13 +106,13 @@
           <q-btn
             color="primary"
             @click="expenseDialog.show = true"
-            :disable="!castleWalletConfigured || !userWalletConfigured"
+            :disable="!castleWalletConfigured || (!userWalletConfigured && !isSuperUser)"
           >
             Add Expense
             <q-tooltip v-if="!castleWalletConfigured">
               Castle wallet must be configured first
             </q-tooltip>
-            <q-tooltip v-if="castleWalletConfigured && !userWalletConfigured">
+            <q-tooltip v-if="castleWalletConfigured && !userWalletConfigured && !isSuperUser">
               You must configure your wallet first
             </q-tooltip>
           </q-btn>
@@ -344,20 +344,27 @@
     <q-form @submit="submitUserWallet" class="q-gutter-md">
       <div class="text-h6 q-mb-md">Configure Your Wallet</div>
 
-      <q-input
+      <q-select
         filled
         dense
-        v-model.trim="userWalletDialog.userWalletId"
-        label="Your Wallet ID *"
-        placeholder="Enter your wallet ID"
-      ></q-input>
+        emit-value
+        v-model="userWalletDialog.userWalletId"
+        :options="g.user.walletOptions"
+        label="Your Wallet *"
+      ></q-select>
 
       <div class="text-caption text-grey">
-        This is the wallet you'll use for Castle transactions. You can find your wallet ID in the LNbits wallet settings.
+        Select the wallet you'll use for Castle transactions.
       </div>
 
       <div class="row q-mt-lg">
-        <q-btn unelevated color="primary" type="submit" :loading="userWalletDialog.loading">
+        <q-btn
+          unelevated
+          color="primary"
+          type="submit"
+          :loading="userWalletDialog.loading"
+          :disable="!userWalletDialog.userWalletId"
+        >
           Save Wallet
         </q-btn>
         <q-btn v-close-popup flat color="grey" class="q-ml-auto">Cancel</q-btn>
diff --git a/views_api.py b/views_api.py
index 42ed6b7..466730e 100644
--- a/views_api.py
+++ b/views_api.py
@@ -59,13 +59,26 @@ async def check_castle_wallet_configured() -> str:
 
 async def check_user_wallet_configured(user_id: str) -> str:
     """Ensure user has configured their wallet, return wallet_id"""
-    settings = await get_user_wallet(user_id)
-    if not settings or not settings.user_wallet_id:
+    from lnbits.settings import settings as lnbits_settings
+
+    # If user is super user, use the castle wallet
+    if user_id == lnbits_settings.super_user:
+        castle_settings = await get_settings("admin")
+        if castle_settings and castle_settings.castle_wallet_id:
+            return castle_settings.castle_wallet_id
+        raise HTTPException(
+            status_code=HTTPStatus.BAD_REQUEST,
+            detail="Castle wallet not configured. Please configure the Castle wallet in settings.",
+        )
+
+    # For regular users, check their personal wallet
+    user_wallet = await get_user_wallet(user_id)
+    if not user_wallet or not user_wallet.user_wallet_id:
         raise HTTPException(
             status_code=HTTPStatus.BAD_REQUEST,
             detail="You must configure your wallet in settings before using this feature.",
         )
-    return settings.user_wallet_id
+    return user_wallet.user_wallet_id
 
 
 # ===== UTILITY ENDPOINTS =====
@@ -529,6 +542,16 @@ async def api_get_user_wallet(
     user: User = Depends(check_user_exists),
 ) -> UserWalletSettings:
     """Get current user's wallet settings"""
+    from lnbits.settings import settings as lnbits_settings
+
+    # If user is super user, return the castle wallet
+    if user.id == lnbits_settings.super_user:
+        castle_settings = await get_settings("admin")
+        if castle_settings and castle_settings.castle_wallet_id:
+            return UserWalletSettings(user_wallet_id=castle_settings.castle_wallet_id)
+        return UserWalletSettings()
+
+    # For regular users, get their personal wallet
     settings = await get_user_wallet(user.id)
     # Return empty settings if not configured (so UI can show setup screen)
     if not settings:
@@ -542,6 +565,15 @@ async def api_update_user_wallet(
     user: User = Depends(check_user_exists),
 ) -> UserWalletSettings:
     """Update current user's wallet settings"""
+    from lnbits.settings import settings as lnbits_settings
+
+    # Super user cannot set their wallet separately - it's always the castle wallet
+    if user.id == lnbits_settings.super_user:
+        raise HTTPException(
+            status_code=HTTPStatus.FORBIDDEN,
+            detail="Super user wallet is automatically set to the Castle wallet. Update Castle settings instead.",
+        )
+
     if not data.user_wallet_id:
         raise HTTPException(
             status_code=HTTPStatus.BAD_REQUEST,