diff --git a/backend/src/payment/providers/services/btcpay.service.ts b/backend/src/payment/providers/services/btcpay.service.ts
index 7457aff..f187803 100644
--- a/backend/src/payment/providers/services/btcpay.service.ts
+++ b/backend/src/payment/providers/services/btcpay.service.ts
@@ -345,12 +345,13 @@ export class BTCPayService implements LightningService {
   async sendPaymentWithAddress(
     address: string,
     payment: Payment,
+    comment?: string,
   ): Promise<LightningPaymentDTO> {
     try {
       const sats = Math.floor(payment.milisatsAmount / 1000);
 
       // Resolve the Lightning address to a BOLT11 invoice
-      const bolt11 = await this.resolveLightningAddress(address, sats);
+      const bolt11 = await this.resolveLightningAddress(address, sats, comment);
 
       // Pay the BOLT11 via BTCPay's internal Lightning node
       const payUrl = this.storeUrl('/lightning/BTC/invoices/pay');
@@ -578,6 +579,7 @@ export class BTCPayService implements LightningService {
   private async resolveLightningAddress(
     address: string,
     amountSats: number,
+    comment?: string,
   ): Promise<string> {
     const [username, domain] = address.split('@');
     if (!username || !domain) {
@@ -606,6 +608,16 @@ export class BTCPayService implements LightningService {
     const callbackUrl = new URL(lnurlData.callback);
     callbackUrl.searchParams.set('amount', amountMillisats.toString());
 
+    // Include a descriptive comment if the endpoint supports it.
+    // LNURL-pay endpoints advertise commentAllowed (max char length).
+    const commentAllowed = lnurlData.commentAllowed || 0;
+    if (comment && commentAllowed > 0) {
+      callbackUrl.searchParams.set(
+        'comment',
+        comment.slice(0, commentAllowed),
+      );
+    }
+
     const { data: invoiceData } = await axios.get(callbackUrl.toString(), { timeout: 10_000 });
 
     if (invoiceData.status === 'ERROR') {
diff --git a/backend/src/payment/providers/services/lightning.service.ts b/backend/src/payment/providers/services/lightning.service.ts
index c02b20b..13e73fd 100644
--- a/backend/src/payment/providers/services/lightning.service.ts
+++ b/backend/src/payment/providers/services/lightning.service.ts
@@ -5,6 +5,7 @@ export interface LightningService {
   sendPaymentWithAddress(
     address: string,
     payment: Payment,
+    comment?: string,
   ): Promise<LightningPaymentDTO>;
 
   validateAddress(address: string): Promise<boolean>;
diff --git a/backend/src/payment/providers/services/strike.service.ts b/backend/src/payment/providers/services/strike.service.ts
index 477baaa..62581dc 100644
--- a/backend/src/payment/providers/services/strike.service.ts
+++ b/backend/src/payment/providers/services/strike.service.ts
@@ -23,6 +23,7 @@ export class StrikeService implements LightningService {
   async sendPaymentWithAddress(
     address: string,
     payment: Payment,
+    comment?: string,
     currency: 'USD' | 'BTC' = 'BTC',
   ): Promise<LightningPaymentDTO> {
     try {
@@ -39,7 +40,7 @@ export class StrikeService implements LightningService {
               : payment.usdAmount,
           currency,
         },
-        description: isBlinkWallet ? undefined : 'Tip from IndeeHub',
+        description: isBlinkWallet ? undefined : (comment || 'Tip from IndeeHub'),
       });
 
       const createPaymentConfig = {
diff --git a/backend/src/payment/services/payment.service.ts b/backend/src/payment/services/payment.service.ts
index d547460..a9312e1 100644
--- a/backend/src/payment/services/payment.service.ts
+++ b/backend/src/payment/services/payment.service.ts
@@ -233,7 +233,7 @@ export class PaymentService {
       order: {
         [column]: 'DESC',
       },
-      relations: ['filmmaker', 'filmmaker.paymentMethods'],
+      relations: ['filmmaker', 'filmmaker.paymentMethods', 'content'],
       take: 5,
     };
 
@@ -347,10 +347,16 @@ export class PaymentService {
     }
 
     try {
+      // Build a descriptive comment for the Lightning invoice so the
+      // creator's wallet shows what the payment is for.
+      const contentTitle = shareholder.content?.title || 'content';
+      const payoutComment = `IndeeHub ${type} payout - ${contentTitle}`;
+
       this.logger.log(`[payout:${type}] Sending ${rounded} sats to ${selectedLightningAddress.lightningAddress}...`);
       const providerPayment = await this.provider.sendPaymentWithAddress(
         selectedLightningAddress.lightningAddress,
         payment,
+        payoutComment,
       );
 
       payment.providerId = providerPayment.id;
diff --git a/src/components/AppHeader.vue b/src/components/AppHeader.vue
index 87c7621..f49ad23 100644
--- a/src/components/AppHeader.vue
+++ b/src/components/AppHeader.vue
@@ -269,7 +269,28 @@
                 {{ userInitials }}
               </div>
               <span class="text-white text-sm font-medium">{{ userName }}</span>
+              <svg class="w-4 h-4 transition-transform" :class="{ 'rotate-180': dropdownOpen }" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M19 9l-7 7-7-7" />
+              </svg>
             </button>
+
+            <div v-if="dropdownOpen" class="profile-menu absolute right-0 mt-2 w-48">
+              <div class="floating-glass-header py-2 rounded-xl">
+                <button @click="navigateTo('/profile')" class="profile-menu-item flex items-center gap-3 px-4 py-2.5 w-full text-left">
+                  <svg class="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                    <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M16 7a4 4 0 11-8 0 4 4 0 018 0zM12 14a7 7 0 00-7 7h14a7 7 0 00-7-7z" />
+                  </svg>
+                  <span>Profile</span>
+                </button>
+                <div class="border-t border-white/10 my-1"></div>
+                <button @click="handleLogout" class="profile-menu-item flex items-center gap-3 px-4 py-2.5 text-red-400 w-full text-left">
+                  <svg class="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                    <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M17 16l4-4m0 0l-4-4m4 4H7m6 4v1a3 3 0 01-3 3H6a3 3 0 01-3-3V7a3 3 0 013-3h4a3 3 0 013 3v1" />
+                  </svg>
+                  <span>Sign Out</span>
+                </button>
+              </div>
+            </div>
           </div>
 
           <!-- Mobile -->
@@ -374,6 +395,29 @@ const hasNostrSession = computed(() => {
   return !!(sessionStorage.getItem('nostr_token') || sessionStorage.getItem('auth_token'))
 })
 
+/**
+ * Auto-detect stale auth state: backend thinks we're authenticated
+ * (sessionStorage tokens exist) but accountManager has no active
+ * Nostr account (localStorage was cleared). This causes a dead-end
+ * "Nostr" profile button with no dropdown. Fix by auto-logging out.
+ */
+watch(
+  [() => isAuthenticated.value, () => nostrLoggedIn.value],
+  ([authed, nostr]) => {
+    if (authed && !nostr) {
+      // Only auto-logout when the auth type is nostr-based —
+      // check if there's a nostr token but no active Nostr account
+      const hasNostrToken = !!sessionStorage.getItem('nostr_token')
+      const hasNostrPubkey = !!sessionStorage.getItem('nostr_pubkey')
+      if (hasNostrToken || hasNostrPubkey) {
+        console.warn('[AppHeader] Stale Nostr session detected (tokens exist but no active account). Auto-logging out.')
+        handleLogout()
+      }
+    }
+  },
+  { immediate: true },
+)
+
 /** Switch content source and reload */
 function handleSourceSelect(sourceId: string) {
   contentSourceStore.setSource(sourceId as any)
diff --git a/src/components/AuthModal.vue b/src/components/AuthModal.vue
index 221bd28..f0600ac 100644
--- a/src/components/AuthModal.vue
+++ b/src/components/AuthModal.vue
@@ -64,27 +64,29 @@
               </div>
             </div>
 
-            <!-- Nostr Login Button (NIP-07 Browser Extension) -->
-            <button
-              @click="handleNostrLogin"
-              :disabled="isLoading"
-              class="nostr-login-button w-full flex items-center justify-center gap-2"
-            >
-              <svg class="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24">
-                <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M15 7a2 2 0 012 2m4 0a6 6 0 01-7.743 5.743L11 17H9v2H7v2H4a1 1 0 01-1-1v-2.586a1 1 0 01.293-.707l5.964-5.964A6 6 0 1121 9z" />
-              </svg>
-              Sign in with Nostr Extension
-            </button>
+            <!-- Nostr Login Button (NIP-07 Browser Extension) — only shown when extension is installed -->
+            <template v-if="hasNostrExtension">
+              <button
+                @click="handleNostrLogin"
+                :disabled="isLoading"
+                class="nostr-login-button w-full flex items-center justify-center gap-2"
+              >
+                <svg class="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                  <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M15 7a2 2 0 012 2m4 0a6 6 0 01-7.743 5.743L11 17H9v2H7v2H4a1 1 0 01-1-1v-2.586a1 1 0 01.293-.707l5.964-5.964A6 6 0 1121 9z" />
+                </svg>
+                Sign in with Nostr Extension
+              </button>
 
-            <!-- Divider between Nostr methods -->
-            <div class="relative my-4">
-              <div class="absolute inset-0 flex items-center">
-                <div class="w-full border-t border-white/10"></div>
+              <!-- Divider between Nostr methods -->
+              <div class="relative my-4">
+                <div class="absolute inset-0 flex items-center">
+                  <div class="w-full border-t border-white/10"></div>
+                </div>
+                <div class="relative flex justify-center text-sm">
+                  <span class="px-4 bg-transparent text-white/30 text-xs">or</span>
+                </div>
               </div>
-              <div class="relative flex justify-center text-sm">
-                <span class="px-4 bg-transparent text-white/30 text-xs">or</span>
-              </div>
-            </div>
+            </template>
 
             <!-- Amber Login (NIP-55 Android Signer) — 3-phase flow -->
             <button
@@ -254,6 +256,9 @@ const mode = ref<'login' | 'register' | 'forgot'>(props.defaultMode)
 const errorMessage = ref<string | null>(null)
 const isLoading = computed(() => authLoading.value || sovereignGenerating.value)
 
+// NIP-07 extension detection — hide the button entirely when no extension is installed
+const hasNostrExtension = ref(!!(window as any).nostr)
+
 // Amber three-phase login state
 const amberPhase = ref<'idle' | 'waiting-pubkey' | 'waiting-signature'>('idle')
 const amberPubkey = ref<string | null>(null)
diff --git a/src/components/ZapModal.vue b/src/components/ZapModal.vue
index fbea8ea..954d1a2 100644
--- a/src/components/ZapModal.vue
+++ b/src/components/ZapModal.vue
@@ -10,8 +10,22 @@
             </svg>
           </button>
 
+          <!-- ─── NO CREATOR STATE ─── -->
+          <template v-if="noCreator">
+            <div class="text-center py-4">
+              <div class="text-5xl mb-5">🤷‍♂️</div>
+              <h2 class="text-2xl font-bold text-white mb-3">This is free content</h2>
+              <p class="text-white/50 text-sm mb-6 max-w-xs mx-auto leading-relaxed">
+                No creator to zap — this content doesn't have a Lightning-enabled creator on IndeeHub yet.
+              </p>
+              <button @click="closeModal" class="zap-pay-button w-full flex items-center justify-center">
+                Got it
+              </button>
+            </div>
+          </template>
+
           <!-- ─── AMOUNT SELECTION STATE ─── -->
-          <template v-if="paymentState === 'select'">
+          <template v-else-if="paymentState === 'select'">
             <div class="text-center mb-6">
               <div class="w-14 h-14 mx-auto mb-4 rounded-full bg-[#F7931A]/15 flex items-center justify-center">
                 <svg class="w-7 h-7 text-[#F7931A]" viewBox="0 0 24 24" fill="currentColor">
@@ -83,7 +97,7 @@
           </template>
 
           <!-- ─── INVOICE STATE: QR Code + BOLT11 ─── -->
-          <template v-if="paymentState === 'invoice'">
+          <template v-else-if="paymentState === 'invoice'">
             <div class="text-center">
               <h2 class="text-2xl font-bold text-white mb-2">Pay with Lightning</h2>
               <p class="text-white/50 text-sm mb-6">Scan the QR code or copy the invoice</p>
@@ -132,7 +146,7 @@
           </template>
 
           <!-- ─── SUCCESS STATE: Lightning Celebration ─── -->
-          <template v-if="paymentState === 'success'">
+          <template v-else-if="paymentState === 'success'">
             <div class="text-center py-4 relative overflow-hidden">
               <!-- Animated lightning bolts background -->
               <div class="zap-celebration">
@@ -213,6 +227,8 @@ const customActive = ref(false)
 const isLoading = ref(false)
 const errorMessage = ref<string | null>(null)
 const creatorName = ref<string | null>(null)
+/** True when the content has no zappable creator (free/partner content) */
+const noCreator = ref(false)
 const successQuote = ref('')
 
 // LNURL-pay data
@@ -286,6 +302,7 @@ watch(() => props.isOpen, async (open) => {
     qrCodeDataUrl.value = ''
     copyButtonText.value = 'Copy Invoice'
     creatorName.value = props.content?.creator || null
+    noCreator.value = false
     lnurlCallback.value = null
     verifyUrl.value = null
     successQuote.value = ''
@@ -311,12 +328,21 @@ async function resolveLightningAddress() {
 
   try {
     const projectId = props.content.id
-    const ownerData = await indeehubApiService.get<{
-      id: string
-      professionalName?: string
-    }>(`/filmmakers/project/${projectId}/owner`)
+    let ownerData: { id: string; professionalName?: string } | null = null
 
-    if (!ownerData?.id) return
+    try {
+      ownerData = await indeehubApiService.get<{
+        id: string
+        professionalName?: string
+      }>(`/filmmakers/project/${projectId}/owner`)
+    } catch {
+      // API returned error (e.g. 404 for free/partner content)
+    }
+
+    if (!ownerData?.id) {
+      noCreator.value = true
+      return
+    }
 
     if (ownerData.professionalName) {
       creatorName.value = ownerData.professionalName
@@ -327,7 +353,10 @@ async function resolveLightningAddress() {
     }>(`/filmmakers/${ownerData.id}/lightning-address`)
 
     const lightningAddress = addressData?.lightningAddress
-    if (!lightningAddress) return
+    if (!lightningAddress) {
+      noCreator.value = true
+      return
+    }
 
     const [username, domain] = lightningAddress.split('@')
     if (!username || !domain) return
@@ -345,6 +374,7 @@ async function resolveLightningAddress() {
     lnurlMaxSats.value = Math.floor((lnurlData.maxSendable || 10_000_000_000) / 1000)
   } catch (err) {
     console.warn('[ZapModal] Failed to resolve lightning address:', err)
+    noCreator.value = true
   }
 }
 
diff --git a/src/stores/auth.ts b/src/stores/auth.ts
index 4ba655f..ccca59d 100644
--- a/src/stores/auth.ts
+++ b/src/stores/auth.ts
@@ -20,17 +20,18 @@ function isConnectionError(error: any): boolean {
 /** Build a mock Nostr user with filmmaker profile + subscription */
 function buildMockNostrUser(pubkey: string) {
   const mockUserId = 'mock-nostr-user-' + pubkey.slice(0, 8)
+  const shortPub = pubkey.slice(0, 8)
   return {
     id: mockUserId,
-    email: `${pubkey.slice(0, 8)}@nostr.local`,
-    legalName: 'Nostr User',
+    email: `${shortPub}@nostr.local`,
+    legalName: `npub...${pubkey.slice(-6)}`,
     nostrPubkey: pubkey,
     createdAt: new Date().toISOString(),
     updatedAt: new Date().toISOString(),
     filmmaker: {
-      id: 'mock-filmmaker-' + pubkey.slice(0, 8),
+      id: 'mock-filmmaker-' + shortPub,
       userId: mockUserId,
-      professionalName: 'Nostr Filmmaker',
+      professionalName: `npub...${pubkey.slice(-6)}`,
       bio: 'Independent filmmaker and content creator.',
     },
     subscriptions: [{