diff --git a/src/modules/activities/components/BookmarkButton.vue b/src/modules/activities/components/BookmarkButton.vue
index 7e578ee..cd04ac1 100644
--- a/src/modules/activities/components/BookmarkButton.vue
+++ b/src/modules/activities/components/BookmarkButton.vue
@@ -3,16 +3,14 @@ import { computed } from 'vue'
 import { useRouter } from 'vue-router'
 import { Button } from '@/components/ui/button'
 import { Heart } from 'lucide-vue-next'
+import { toast } from 'vue-sonner'
 import { useAuth } from '@/composables/useAuthService'
 import { useBookmarks } from '../composables/useBookmarks'
 import { NIP52_KINDS } from '../types/nip52'
 
 const props = defineProps<{
-  /** Activity organizer pubkey */
   pubkey: string
-  /** Activity d-tag */
   dTag: string
-  /** Activity kind (default: 31923) */
   kind?: number
 }>()
 
@@ -25,7 +23,12 @@ const bookmarked = computed(() => isBookmarked(activityKind.value, props.pubkey,
 
 function handleToggle() {
   if (!isAuthenticated.value) {
-    router.push('/login')
+    toast.info('Log in to save favorites', {
+      action: {
+        label: 'Log in',
+        onClick: () => router.push('/login'),
+      },
+    })
     return
   }
   toggleBookmark(activityKind.value, props.pubkey, props.dTag)
diff --git a/src/modules/activities/components/RSVPButton.vue b/src/modules/activities/components/RSVPButton.vue
index 000fc85..e1d0266 100644
--- a/src/modules/activities/components/RSVPButton.vue
+++ b/src/modules/activities/components/RSVPButton.vue
@@ -1,8 +1,10 @@
 <script setup lang="ts">
 import { computed } from 'vue'
+import { useRouter } from 'vue-router'
 import { useI18n } from 'vue-i18n'
 import { Button } from '@/components/ui/button'
 import { Check, HelpCircle, X } from 'lucide-vue-next'
+import { toast } from 'vue-sonner'
 import { useAuth } from '@/composables/useAuthService'
 import { useRSVP } from '../composables/useRSVP'
 import { NIP52_KINDS, type RSVPStatus } from '../types/nip52'
@@ -13,6 +15,7 @@ const props = defineProps<{
   kind?: number
 }>()
 
+const router = useRouter()
 const { t } = useI18n()
 const { isAuthenticated } = useAuth()
 const { getMyRSVP, getRSVPCount, setRSVP } = useRSVP()
@@ -28,12 +31,21 @@ const buttons: { status: RSVPStatus; labelKey: string; icon: any }[] = [
 ]
 
 function handleClick(status: RSVPStatus) {
+  if (!isAuthenticated.value) {
+    toast.info('Log in to RSVP', {
+      action: {
+        label: 'Log in',
+        onClick: () => router.push('/login'),
+      },
+    })
+    return
+  }
   setRSVP(activityKind.value, props.pubkey, props.dTag, status)
 }
 </script>
 
 <template>
-  <div v-if="isAuthenticated" class="space-y-2">
+  <div class="space-y-2">
     <div class="flex gap-2">
       <Button
         v-for="btn in buttons"