diff --git a/.github/workflows/ui-tests.yml b/.github/workflows/ui-tests.yml
index 68ab395b..07bb93e4 100644
--- a/.github/workflows/ui-tests.yml
+++ b/.github/workflows/ui-tests.yml
@@ -111,6 +111,10 @@ jobs:
           bench --site buzz.test set-config allow_tests true
           bench --site buzz.test set-config host_name "http://buzz.test:8000"
 
+      - name: Create Test User
+        working-directory: /home/runner/frappe-bench
+        run: bench --site buzz.test add-user testuser@buzz.test --first-name Test --last-name User --password Test@123 --add-role "System Manager"
+
       - name: Start Frappe Server
         working-directory: /home/runner/frappe-bench
         run: |
@@ -135,8 +139,8 @@ jobs:
         run: npx playwright test
         env:
           BASE_URL: http://buzz.test:8000
-          FRAPPE_USER: Administrator
-          FRAPPE_PASSWORD: admin
+          FRAPPE_USER: testuser@buzz.test
+          FRAPPE_PASSWORD: Test@123
 
       - name: Upload Playwright Report
         uses: actions/upload-artifact@v4
diff --git a/buzz/api/auth.py b/buzz/api/auth.py
new file mode 100644
index 00000000..a1335646
--- /dev/null
+++ b/buzz/api/auth.py
@@ -0,0 +1,38 @@
+import frappe
+from frappe.utils import cint, md_to_html
+from frappe.utils.oauth import get_oauth2_authorize_url, get_oauth_keys
+
+
+@frappe.whitelist(allow_guest=True)  # nosemgrep: frappe-semgrep-rules.rules.security.guest-whitelisted-method
+def get_login_context(redirect_to: str | None = None):
+	context = {
+		"disable_signup": frappe.get_website_settings("disable_signup"),
+		"disable_user_pass_login": frappe.get_system_settings("disable_user_pass_login"),
+		"login_with_email_link": frappe.get_system_settings("login_with_email_link"),
+		"login_banner": md_to_html(raw_banner)
+		if (raw_banner := frappe.db.get_single_value("Buzz Settings", "login_banner"))
+		else None,
+		"provider_logins": [],
+	}
+
+	if not redirect_to:
+		redirect_to = frappe.utils.get_url("/dashboard")
+
+	social_login_keys = frappe.get_all(
+		"Social Login Key",
+		filters={"enable_social_login": 1},
+		fields=["name", "provider_name", "icon", "client_id", "base_url"],
+	)
+
+	for provider in social_login_keys:
+		if provider.client_id and provider.base_url and get_oauth_keys(provider.name):
+			context["provider_logins"].append(
+				{
+					"name": provider.name,
+					"provider_name": provider.provider_name,
+					"icon": provider.icon or "",
+					"auth_url": get_oauth2_authorize_url(provider.name, redirect_to),
+				}
+			)
+
+	return context
diff --git a/buzz/events/doctype/buzz_settings/buzz_settings.json b/buzz/events/doctype/buzz_settings/buzz_settings.json
index 83cdc042..f690cac4 100644
--- a/buzz/events/doctype/buzz_settings/buzz_settings.json
+++ b/buzz/events/doctype/buzz_settings/buzz_settings.json
@@ -13,6 +13,9 @@
   "allow_add_ons_change_before_event_start_days",
   "column_break_hagy",
   "allow_ticket_cancellation_request_before_event_start_days",
+  "login_tab",
+  "login_banner_section",
+  "login_banner",
   "communications_tab",
   "ticketing_emails_section",
   "default_ticket_email_template",
@@ -73,6 +76,22 @@
    "label": "Support Email",
    "options": "Email"
   },
+  {
+   "fieldname": "login_tab",
+   "fieldtype": "Tab Break",
+   "label": "Login"
+  },
+  {
+   "fieldname": "login_banner_section",
+   "fieldtype": "Section Break",
+   "label": "Login Banner Config"
+  },
+  {
+   "description": "Promotional message shown in the login/signup modal. Supports Markdown.",
+   "fieldname": "login_banner",
+   "fieldtype": "Markdown Editor",
+   "label": "Login Banner"
+  },
   {
    "fieldname": "communications_tab",
    "fieldtype": "Tab Break",
@@ -148,7 +167,7 @@
  "index_web_pages_for_search": 1,
  "issingle": 1,
  "links": [],
- "modified": "2026-01-13 22:34:24.493305",
+ "modified": "2026-03-26 17:39:40.326309",
  "modified_by": "Administrator",
  "module": "Events",
  "name": "Buzz Settings",
diff --git a/buzz/events/doctype/buzz_settings/buzz_settings.py b/buzz/events/doctype/buzz_settings/buzz_settings.py
index d5031a0b..3ab416c2 100644
--- a/buzz/events/doctype/buzz_settings/buzz_settings.py
+++ b/buzz/events/doctype/buzz_settings/buzz_settings.py
@@ -21,8 +21,9 @@ class BuzzSettings(Document):
 		auto_send_pitch_deck: DF.Check
 		default_sponsor_deck_cc: DF.SmallText | None
 		default_sponsor_deck_email_template: DF.Link | None
-		default_sponsor_deck_reply_to: DF.Data
+		default_sponsor_deck_reply_to: DF.Data | None
 		default_ticket_email_template: DF.Link | None
+		login_banner: DF.MarkdownEditor | None
 		support_email: DF.Data | None
 	# end: auto-generated types
 
diff --git a/dashboard/components.d.ts b/dashboard/components.d.ts
index 916445e6..d8d060ca 100644
--- a/dashboard/components.d.ts
+++ b/dashboard/components.d.ts
@@ -26,6 +26,7 @@ declare module 'vue' {
     EventSelector: typeof import('./src/components/EventSelector.vue')['default']
     EventSponsorForm: typeof import('./src/components/EventSponsorForm.vue')['default']
     LanguageSwitcher: typeof import('./src/components/LanguageSwitcher.vue')['default']
+    LoginDialog: typeof import('./src/components/LoginDialog.vue')['default']
     LoginRequired: typeof import('./src/components/LoginRequired.vue')['default']
     Navbar: typeof import('./src/components/Navbar.vue')['default']
     OfflinePaymentDialog: typeof import('./src/components/OfflinePaymentDialog.vue')['default']
diff --git a/dashboard/src/App.vue b/dashboard/src/App.vue
index 13fb7937..6987cad9 100644
--- a/dashboard/src/App.vue
+++ b/dashboard/src/App.vue
@@ -1,4 +1,5 @@
 <script setup lang="ts">
+import LoginDialog from "@/components/LoginDialog.vue";
 import { FrappeUIProvider, setConfig } from "frappe-ui";
 import Layout from "./layouts/Layout.vue";
 
@@ -11,5 +12,6 @@ setConfig("localTimezone", window.timezone?.user || null);
 		<Layout>
 			<router-view />
 		</Layout>
+		<LoginDialog />
 	</FrappeUIProvider>
 </template>
diff --git a/dashboard/src/components/BookingForm.vue b/dashboard/src/components/BookingForm.vue
index 5a8a9f6e..642dd766 100644
--- a/dashboard/src/components/BookingForm.vue
+++ b/dashboard/src/components/BookingForm.vue
@@ -93,7 +93,7 @@
 					<p class="text-xs text-ink-gray-5">
 						{{ __("Want to manage your bookings?") }}
 					</p>
-					<Button variant="outline" @click="redirectToLogin">
+					<Button variant="outline" @click="openLoginDialog()">
 						{{ __("Log in to your account") }}
 					</Button>
 				</div>
@@ -397,11 +397,12 @@
 
 <script setup>
 import { useBookingFormStorage } from "@/composables/useBookingFormStorage";
+import { useLoginDialog } from "@/composables/useLoginDialog";
 import { userResource } from "@/data/user";
 import { formatCurrency, formatPriceOrFree } from "@/utils/currency";
-import { clearBookingCache, redirectToLogin } from "@/utils/index";
+import { clearBookingCache } from "@/utils/index";
 import { FormControl, createResource, toast } from "frappe-ui";
-import { computed, onUnmounted, ref, watch } from "vue";
+import { computed, nextTick, onMounted, onUnmounted, ref, watch } from "vue";
 import { useRoute, useRouter } from "vue-router";
 import LucideAlertCircle from "~icons/lucide/alert-circle";
 import LucideCheck from "~icons/lucide/check";
@@ -417,6 +418,7 @@ import PaymentGatewayDialog from "./PaymentGatewayDialog.vue";
 
 const router = useRouter();
 const route = useRoute();
+const { open: openLoginDialog } = useLoginDialog();
 
 const getUtmParameters = () => {
 	const utmParams = [];
@@ -802,26 +804,25 @@ const totalCurrency = computed(() => {
 	return firstTicket ? firstTicket.currency : "INR";
 });
 
-// --- WATCHER ---
 // Initialize with one attendee when component mounts (only if no data in storage)
-watch(
-	() => props.availableTicketTypes,
-	() => {
-		if (attendees.value.length === 0 && props.availableTicketTypes.length > 0) {
-			const newAttendee = createNewAttendee();
-
-			// Pre-populate with current user's information if available
-			if (userResource.data) {
-				newAttendee.first_name = userResource.data.first_name || "";
-				newAttendee.last_name = userResource.data.last_name || "";
-				newAttendee.email = userResource.data.email || "";
-			}
-
-			attendees.value.push(newAttendee);
+onMounted(async () => {
+	await nextTick();
+	if (attendees.value.length === 0 && props.availableTicketTypes.length > 0) {
+		const newAttendee = createNewAttendee();
+
+		if (guestFirstName.value || guestEmail.value) {
+			newAttendee.first_name = guestFirstName.value;
+			newAttendee.last_name = guestLastName.value;
+			newAttendee.email = guestEmail.value;
+		} else if (userResource.data) {
+			newAttendee.first_name = userResource.data.first_name || "";
+			newAttendee.last_name = userResource.data.last_name || "";
+			newAttendee.email = userResource.data.email || "";
 		}
-	},
-	{ immediate: true }
-);
+
+		attendees.value = [newAttendee];
+	}
+});
 
 // Ensure existing attendees have proper add-on structure when availableAddOns changes
 watch(
@@ -1073,6 +1074,11 @@ const validateForm = () => {
 async function submit() {
 	if (processBooking.loading) return;
 
+	if (requiresLogin.value) {
+		openLoginDialog();
+		return;
+	}
+
 	// Validate mandatory fields
 	const validationErrors = validateForm();
 	if (validationErrors.length > 0) {
@@ -1357,11 +1363,19 @@ function clearOtpState() {
 
 const isWebinar = computed(() => props.eventDetails.category === "Webinars");
 
+const requiresLogin = computed(() => {
+	return props.isGuestMode && !props.eventDetails?.allow_guest_booking;
+});
+
 const submitButtonText = computed(() => {
 	if (processBooking.loading) {
 		return __("Processing...");
 	}
 
+	if (requiresLogin.value) {
+		return __("Book Tickets");
+	}
+
 	if (finalTotal.value > 0) {
 		return __("Pay & Book");
 	}
diff --git a/dashboard/src/components/LoginDialog.vue b/dashboard/src/components/LoginDialog.vue
new file mode 100644
index 00000000..7e818f40
--- /dev/null
+++ b/dashboard/src/components/LoginDialog.vue
@@ -0,0 +1,419 @@
+<template>
+	<Dialog v-model="is_open" :options="{ size: 'md' }" @after-leave="resetState">
+		<template #body-title>
+			<h3 class="text-xl font-semibold text-ink-gray-9">
+				{{ view_title }}
+			</h3>
+		</template>
+		<template #body-content>
+			<div
+				v-if="login_context?.login_banner"
+				class="rounded-md bg-surface-gray-2 p-3 prose prose-sm max-w-none mb-6"
+				v-html="login_context.login_banner"
+			/>
+
+			<div
+				v-if="error_message"
+				class="mb-4 rounded-md bg-surface-red-2 p-3 text-sm text-ink-red-3"
+			>
+				{{ error_message }}
+			</div>
+
+			<div
+				v-if="success_message"
+				class="mb-4 rounded-md bg-surface-green-2 p-3 text-sm text-ink-green-3"
+			>
+				{{ success_message }}
+			</div>
+
+			<form v-if="current_view === 'login'" class="space-y-4" @submit.prevent="handleLogin">
+				<template v-if="!login_context?.disable_user_pass_login">
+					<FormControl
+						type="email"
+						:label="__('Email')"
+						:placeholder="__('Enter your email')"
+						v-model="form.email"
+						required
+						@keydown.enter="focusPassword"
+					/>
+					<FormControl
+						ref="password_input"
+						type="password"
+						:label="__('Password')"
+						:placeholder="__('Enter your password')"
+						v-model="form.password"
+						required
+					/>
+					<div class="flex justify-end">
+						<button
+							type="button"
+							class="text-sm text-ink-gray-5 hover:text-ink-gray-7"
+							@click="switchView('forgot-password')"
+						>
+							{{ __("Forgot Password?") }}
+						</button>
+					</div>
+					<Button
+						variant="solid"
+						class="w-full"
+						type="submit"
+						:loading="session.login.loading"
+					>
+						{{ __("Login") }}
+					</Button>
+				</template>
+
+				<template v-if="has_social_logins || login_context?.login_with_email_link">
+					<div class="relative flex items-center justify-center">
+						<div class="absolute inset-0 flex items-center">
+							<div class="w-full border-t border-outline-gray-2" />
+						</div>
+						<span class="relative bg-surface-modal px-2 text-sm text-ink-gray-4">
+							{{ __("or") }}
+						</span>
+					</div>
+
+					<SocialLoginButtons :provider_logins="login_context?.provider_logins" />
+
+					<template v-if="login_context?.login_with_email_link">
+						<Button
+							variant="subtle"
+							class="w-full"
+							type="button"
+							@click="switchView('email-link')"
+						>
+							{{ __("Login with Email Link") }}
+						</Button>
+					</template>
+				</template>
+
+				<div
+					v-if="!login_context?.disable_signup"
+					class="text-center text-sm text-ink-gray-5"
+				>
+					{{ __("Don't have an account?") }}
+					<button
+						type="button"
+						class="font-medium text-ink-gray-7 hover:text-ink-gray-9"
+						@click="switchView('signup')"
+					>
+						{{ __("Sign up") }}
+					</button>
+				</div>
+			</form>
+
+			<form
+				v-else-if="current_view === 'signup'"
+				class="space-y-4"
+				@submit.prevent="handleSignup"
+			>
+				<FormControl
+					type="text"
+					:label="__('Full Name')"
+					:placeholder="__('Enter your full name')"
+					v-model="form.full_name"
+					required
+				/>
+				<FormControl
+					type="email"
+					:label="__('Email')"
+					:placeholder="__('Enter your email')"
+					v-model="form.email"
+					required
+				/>
+				<Button
+					variant="solid"
+					class="w-full"
+					type="submit"
+					:loading="signup_resource.loading"
+				>
+					{{ __("Sign Up") }}
+				</Button>
+
+				<template v-if="has_social_logins">
+					<div class="relative flex items-center justify-center">
+						<div class="absolute inset-0 flex items-center">
+							<div class="w-full border-t border-outline-gray-2" />
+						</div>
+						<span class="relative bg-surface-modal px-2 text-sm text-ink-gray-4">
+							{{ __("or") }}
+						</span>
+					</div>
+
+					<SocialLoginButtons :provider_logins="login_context?.provider_logins" />
+				</template>
+
+				<div class="text-center text-sm text-ink-gray-5">
+					{{ __("Already have an account?") }}
+					<button
+						type="button"
+						class="font-medium text-ink-gray-7 hover:text-ink-gray-9"
+						@click="switchView('login')"
+					>
+						{{ __("Login") }}
+					</button>
+				</div>
+			</form>
+
+			<form
+				v-else-if="current_view === 'forgot-password'"
+				class="space-y-4"
+				@submit.prevent="handleForgotPassword"
+			>
+				<p class="text-sm text-ink-gray-5">
+					{{
+						__(
+							"Enter your email address and we'll send you a link to reset your password."
+						)
+					}}
+				</p>
+				<FormControl
+					type="email"
+					:label="__('Email')"
+					:placeholder="__('Enter your email')"
+					v-model="form.email"
+					required
+				/>
+				<Button
+					variant="solid"
+					class="w-full"
+					type="submit"
+					:loading="forgot_password_resource.loading"
+				>
+					{{ __("Reset Password") }}
+				</Button>
+				<div class="text-center">
+					<button
+						type="button"
+						class="text-sm text-ink-gray-5 hover:text-ink-gray-7"
+						@click="switchView('login')"
+					>
+						{{ __("Back to Login") }}
+					</button>
+				</div>
+			</form>
+
+			<form
+				v-else-if="current_view === 'email-link'"
+				class="space-y-4"
+				@submit.prevent="handleEmailLink"
+			>
+				<p class="text-sm text-ink-gray-5">
+					{{ __("We'll send you a one-time login link to your email address.") }}
+				</p>
+				<FormControl
+					type="email"
+					:label="__('Email')"
+					:placeholder="__('Enter your email')"
+					v-model="form.email"
+					required
+				/>
+				<Button
+					variant="solid"
+					class="w-full"
+					type="submit"
+					:loading="email_link_resource.loading"
+				>
+					{{ __("Send Login Link") }}
+				</Button>
+				<div class="text-center">
+					<button
+						type="button"
+						class="text-sm text-ink-gray-5 hover:text-ink-gray-7"
+						@click="switchView('login')"
+					>
+						{{ __("Back to Login") }}
+					</button>
+				</div>
+			</form>
+		</template>
+	</Dialog>
+</template>
+
+<script setup>
+import { useLoginDialog } from "@/composables/useLoginDialog";
+import { session } from "@/data/session";
+import { userResource } from "@/data/user";
+import { Button, Dialog, FormControl, createResource } from "frappe-ui";
+import { computed, defineComponent, h, ref, watch } from "vue";
+
+const { is_open, close, on_success_callback } = useLoginDialog();
+
+const current_view = ref("login");
+const error_message = ref("");
+const success_message = ref("");
+const password_input = ref(null);
+
+const form = ref({
+	email: "",
+	password: "",
+	full_name: "",
+});
+
+const view_title = computed(() => {
+	const titles = {
+		login: __("Login to Continue"),
+		signup: __("Create Account"),
+		"forgot-password": __("Forgot Password"),
+		"email-link": __("Login with Email Link"),
+	};
+	return titles[current_view.value] || __("Login");
+});
+
+const login_context_resource = createResource({
+	url: "buzz.api.auth.get_login_context",
+	params: { redirect_to: window.location.href },
+	auto: true,
+});
+
+const login_context = computed(() => login_context_resource.data);
+
+const has_social_logins = computed(() => login_context.value?.provider_logins?.length > 0);
+
+const SocialLoginButtons = defineComponent({
+	props: { provider_logins: Array },
+	setup(props) {
+		return () =>
+			(props.provider_logins || []).map((provider) =>
+				h(
+					Button,
+					{
+						variant: "subtle",
+						class: "w-full",
+						type: "button",
+						onClick: () => {
+							window.location.href = provider.auth_url;
+						},
+					},
+					{
+						...(provider.icon
+							? {
+									prefix: () =>
+										h("img", {
+											src: provider.icon,
+											class: "h-4 w-4",
+											alt: provider.provider_name,
+										}),
+							  }
+							: {}),
+						default: () => __("Continue with {0}", [provider.provider_name]),
+					}
+				)
+			);
+	},
+});
+
+function focusPassword() {
+	password_input.value?.$el?.querySelector("input")?.focus();
+}
+
+function switchView(view) {
+	current_view.value = view;
+	error_message.value = "";
+	success_message.value = "";
+}
+
+function resetState() {
+	current_view.value = "login";
+	error_message.value = "";
+	success_message.value = "";
+	form.value = { email: "", password: "", full_name: "" };
+}
+
+function handleLogin() {
+	error_message.value = "";
+	session.login.submit(
+		{ email: form.value.email, password: form.value.password },
+		{
+			onSuccess() {
+				userResource.reload();
+				session.user =
+					session.login.data?.user || document.cookie.match(/user_id=([^;]+)/)?.[1];
+				close();
+				if (on_success_callback.value) {
+					on_success_callback.value();
+				}
+			},
+			onError(error) {
+				error_message.value = error.messages?.[0] || __("Invalid email or password.");
+			},
+		}
+	);
+}
+
+const signup_resource = createResource({
+	url: "frappe.core.doctype.user.user.sign_up",
+});
+
+function handleSignup() {
+	error_message.value = "";
+	signup_resource.submit(
+		{
+			email: form.value.email,
+			full_name: form.value.full_name,
+			redirect_to: window.location.pathname,
+		},
+		{
+			onSuccess(data) {
+				if (data && data[0] === 1) {
+					success_message.value = __("Please check your email to verify your account.");
+				} else if (data && data[1]) {
+					success_message.value = data[1];
+				} else {
+					success_message.value = __("Please check your email to verify your account.");
+				}
+			},
+			onError(error) {
+				error_message.value =
+					error.messages?.[0] || __("Something went wrong. Please try again.");
+			},
+		}
+	);
+}
+
+const forgot_password_resource = createResource({
+	url: "frappe.core.doctype.user.user.reset_password",
+});
+
+function handleForgotPassword() {
+	error_message.value = "";
+	forgot_password_resource.submit(
+		{ user: form.value.email },
+		{
+			onSuccess() {
+				success_message.value = __("Password reset link has been sent to your email.");
+			},
+			onError(error) {
+				error_message.value =
+					error.messages?.[0] || __("Something went wrong. Please try again.");
+			},
+		}
+	);
+}
+
+const email_link_resource = createResource({
+	url: "frappe.www.login.send_login_link",
+});
+
+function handleEmailLink() {
+	error_message.value = "";
+	email_link_resource.submit(
+		{ email: form.value.email },
+		{
+			onSuccess() {
+				success_message.value = __("Login link has been sent to your email.");
+			},
+			onError(error) {
+				error_message.value =
+					error.messages?.[0] || __("Something went wrong. Please try again.");
+			},
+		}
+	);
+}
+
+watch(is_open, (value) => {
+	if (value) {
+		login_context_resource.fetch({ redirect_to: window.location.href });
+	}
+});
+</script>
diff --git a/dashboard/src/components/LoginRequired.vue b/dashboard/src/components/LoginRequired.vue
index 39454103..0197695d 100644
--- a/dashboard/src/components/LoginRequired.vue
+++ b/dashboard/src/components/LoginRequired.vue
@@ -5,21 +5,23 @@
 				{{ __("Login Required") }}
 			</h2>
 			<p class="text-ink-gray-6 mb-6">
-				{{ message }}
+				{{ __(message) }}
 			</p>
-			<Button variant="solid" size="lg" @click="redirectToLogin">{{ __("Log In") }}</Button>
+			<Button variant="solid" size="lg" @click="openLogin">{{ __("Log In") }}</Button>
 		</div>
 	</div>
 </template>
 
 <script setup>
+import { useLoginDialog } from "@/composables/useLoginDialog";
 import { Button } from "frappe-ui";
-import { redirectToLogin } from "@/utils/index";
 
 defineProps({
 	message: {
 		type: String,
-		default: __("Please log in to continue."),
+		default: "Please log in to continue.",
 	},
 });
+
+const { open: openLogin } = useLoginDialog();
 </script>
diff --git a/dashboard/src/components/Navbar.vue b/dashboard/src/components/Navbar.vue
index d9043ffb..64a0d214 100644
--- a/dashboard/src/components/Navbar.vue
+++ b/dashboard/src/components/Navbar.vue
@@ -27,7 +27,7 @@
 				</Button>
 				<Button
 					v-else
-					@click="redirectToLogin"
+					@click="openLoginDialog"
 					icon-right="log-in"
 					variant="ghost"
 					size="md"
@@ -47,10 +47,11 @@ import { session } from "../data/session";
 import LanguageSwitcher from "./LanguageSwitcher.vue";
 import BuzzLogo from "./common/BuzzLogo.vue";
 
-import { redirectToLogin } from "@/utils/index";
+import { useLoginDialog } from "@/composables/useLoginDialog";
 import { useStorage } from "@vueuse/core";
 import { onMounted } from "vue";
 
+const { open: openLoginDialog } = useLoginDialog();
 const userTheme = useStorage("user-theme", "dark");
 
 onMounted(() => {
diff --git a/dashboard/src/composables/useBookingFormStorage.ts b/dashboard/src/composables/useBookingFormStorage.ts
index 948f20b2..53150447 100644
--- a/dashboard/src/composables/useBookingFormStorage.ts
+++ b/dashboard/src/composables/useBookingFormStorage.ts
@@ -12,7 +12,9 @@ export function useBookingFormStorage(eventRoute: string) {
 
 	// Scope storage keys to the specific event route
 	const storageKeyPrefix = `event-booking-${eventRoute}`
-	const attendees = useStorage(`${storageKeyPrefix}-attendees`, [])
+	const attendees = useStorage(`${storageKeyPrefix}-attendees`, [], undefined, {
+		deep: true,
+	})
 	const attendeeIdCounter = useStorage(`${storageKeyPrefix}-counter`, 0)
 	const bookingCustomFields = useStorage(
 		`${storageKeyPrefix}-custom-fields`,
diff --git a/dashboard/src/composables/useCustomFields.ts b/dashboard/src/composables/useCustomFields.ts
index e592b6fe..870f060e 100644
--- a/dashboard/src/composables/useCustomFields.ts
+++ b/dashboard/src/composables/useCustomFields.ts
@@ -27,7 +27,10 @@ export interface SelectOption {
  * @param {string} fieldtype - Frappe field type
  * @returns {string} - FormControl type
  */
-export function getFormControlType(fieldtype: string, options?: string): string {
+export function getFormControlType(
+	fieldtype: string,
+	options?: string,
+): string {
 	if (fieldtype === "Data" && options === "Email") return "email"
 	if (fieldtype === "Data" && options === "URL") return "url"
 
diff --git a/dashboard/src/composables/useLoginDialog.ts b/dashboard/src/composables/useLoginDialog.ts
new file mode 100644
index 00000000..75ea942c
--- /dev/null
+++ b/dashboard/src/composables/useLoginDialog.ts
@@ -0,0 +1,18 @@
+import { ref } from "vue"
+
+const is_open = ref(false)
+const on_success_callback = ref<(() => void) | null>(null)
+
+export function useLoginDialog() {
+	function open(on_success?: () => void) {
+		on_success_callback.value = on_success || null
+		is_open.value = true
+	}
+
+	function close() {
+		is_open.value = false
+		on_success_callback.value = null
+	}
+
+	return { is_open, open, close, on_success_callback }
+}
diff --git a/dashboard/src/data/session.ts b/dashboard/src/data/session.ts
index 08a8f5ba..e00fcf6b 100644
--- a/dashboard/src/data/session.ts
+++ b/dashboard/src/data/session.ts
@@ -1,4 +1,3 @@
-import router from "@/router"
 import { clearBookingCache } from "@/utils"
 import { createResource } from "frappe-ui"
 import { computed, reactive } from "vue"
@@ -9,10 +8,6 @@ interface LoginParams {
 	password: string
 }
 
-interface LoginResponse {
-	default_route?: string
-}
-
 export function sessionUser() {
 	const cookies = new URLSearchParams(document.cookie.split("; ").join("&"))
 	let _sessionUser = cookies.get("user_id")
@@ -31,11 +26,10 @@ export const session = reactive({
 				pwd: password,
 			}
 		},
-		onSuccess(data: LoginResponse) {
+		onSuccess() {
 			userResource.reload()
 			session.user = sessionUser()
 			session.login.reset()
-			router.replace(data.default_route || "/")
 		},
 	}),
 	logout: createResource({
@@ -44,8 +38,7 @@ export const session = reactive({
 			userResource.reset()
 			session.user = sessionUser()
 			clearBookingCache()
-			const redirect_to = window.location.pathname + window.location.search
-			window.location.href = `/login?redirect-to=${encodeURIComponent(redirect_to)}`
+			window.location.reload()
 		},
 	}),
 	user: sessionUser(),
diff --git a/dashboard/src/data/user.ts b/dashboard/src/data/user.ts
index 257bb941..e13a118e 100644
--- a/dashboard/src/data/user.ts
+++ b/dashboard/src/data/user.ts
@@ -1,12 +1,6 @@
-import type { FrappeError } from "@/types/Frappe/FrappeError"
 import { createResource } from "frappe-ui"
 
 export const userResource = createResource({
 	url: "buzz.api.get_user_info",
 	cache: "User",
-	onError(error: FrappeError) {
-		if (error && error.exc_type === "AuthenticationError") {
-			window.location.href = "/login?redirect-to=dashboard"
-		}
-	},
 })
diff --git a/dashboard/src/layouts/Layout.vue b/dashboard/src/layouts/Layout.vue
index dffd4767..d03369db 100644
--- a/dashboard/src/layouts/Layout.vue
+++ b/dashboard/src/layouts/Layout.vue
@@ -4,11 +4,23 @@
 			<Navbar />
 		</div>
 		<div class="max-w-4xl py-8 px-4 md:py-12 mx-auto">
-			<slot></slot>
+			<template v-if="requires_auth && !session.isLoggedIn">
+				<LoginRequired />
+			</template>
+			<template v-else>
+				<slot></slot>
+			</template>
 		</div>
 	</div>
 </template>
 
 <script setup>
+import LoginRequired from "@/components/LoginRequired.vue";
 import Navbar from "@/components/Navbar.vue";
+import { session } from "@/data/session";
+import { computed } from "vue";
+import { useRoute } from "vue-router";
+
+const route = useRoute();
+const requires_auth = computed(() => !route.meta?.isPublic);
 </script>
diff --git a/dashboard/src/pages/BookTickets.vue b/dashboard/src/pages/BookTickets.vue
index 4457ca3e..2db245b7 100644
--- a/dashboard/src/pages/BookTickets.vue
+++ b/dashboard/src/pages/BookTickets.vue
@@ -45,10 +45,6 @@
 				}}</Button>
 			</div>
 		</div>
-		<LoginRequired
-			v-else-if="!canAccessBookingPage && !eventBookingResource.loading"
-			:message="__('Please log in to book tickets for this event.')"
-		/>
 		<div v-else>
 			<BookingForm
 				v-if="eventBookingData.availableAddOns && eventBookingData.availableTicketTypes"
@@ -67,7 +63,6 @@
 </template>
 
 <script setup>
-import LoginRequired from "@/components/LoginRequired.vue";
 import { session } from "@/data/session";
 import { Spinner, createResource } from "frappe-ui";
 import { computed, reactive, ref } from "vue";
@@ -99,10 +94,6 @@ const goToHome = () => {
 	window.location.href = "/";
 };
 
-const canAccessBookingPage = computed(() => {
-	return session.isLoggedIn || eventBookingData.eventDetails?.allow_guest_booking;
-});
-
 const eventBookingResource = createResource({
 	url: "buzz.api.get_event_booking_data",
 	params: {
diff --git a/dashboard/src/router.ts b/dashboard/src/router.ts
index 37aab9d9..6ee89dde 100644
--- a/dashboard/src/router.ts
+++ b/dashboard/src/router.ts
@@ -1,6 +1,5 @@
 import { userResource } from "@/data/user"
 import { type RouteRecordRaw, createRouter, createWebHistory } from "vue-router"
-import { session } from "./data/session"
 
 const routes: RouteRecordRaw[] = [
 	{
@@ -116,25 +115,12 @@ const router = createRouter({
 })
 
 router.beforeEach(async (to, from, next) => {
-	let isLoggedIn = session.isLoggedIn
 	try {
 		await userResource.fetch()
-	} catch (error) {
-		isLoggedIn = false
-	}
-
-	if (to.meta?.isPublic) {
-		next()
-		return
-	}
-
-	if (to.name === "Login" && isLoggedIn) {
-		next({ name: "dashboard" })
-	} else if (to.name !== "Login" && !isLoggedIn) {
-		window.location.href = `/login?redirect-to=/dashboard${encodeURIComponent(to.fullPath)}`
-	} else {
-		next()
+	} catch {
+		// user is not logged in — Layout will show LoginRequired for protected routes
 	}
+	next()
 })
 
 export default router
diff --git a/dashboard/src/utils/index.ts b/dashboard/src/utils/index.ts
index 658ae6ad..72df3e58 100644
--- a/dashboard/src/utils/index.ts
+++ b/dashboard/src/utils/index.ts
@@ -26,11 +26,3 @@ export function clearBookingCache(): void {
 	}
 	keysToRemove.forEach((key) => localStorage.removeItem(key))
 }
-
-/**
- * Redirect to login page with current path as redirect-to parameter
- */
-export function redirectToLogin() {
-	const currentPath = window.location.pathname + window.location.search
-	window.location.href = `/login?redirect-to=${encodeURIComponent(currentPath)}`
-}
diff --git a/e2e/tests/auth.spec.ts b/e2e/tests/auth.spec.ts
index 17403c3d..b6d4823e 100644
--- a/e2e/tests/auth.spec.ts
+++ b/e2e/tests/auth.spec.ts
@@ -50,12 +50,10 @@ test.describe("Authentication - Fresh state", () => {
 		await loginPage.expectToBeOnLoginPage();
 	});
 
-	test("should redirect to login when not authenticated", async ({ page }) => {
-		// Try to access protected page without auth
+	test("should show login button when not authenticated", async ({ page }) => {
 		await page.goto("/dashboard");
 		await page.waitForLoadState("networkidle");
 
-		// Should be redirected to login
-		await expect(page).toHaveURL(/.*login.*/);
+		await expect(page.getByRole("button", { name: "Log In" }).first()).toBeVisible();
 	});
 });
diff --git a/e2e/tests/login-modal.spec.ts b/e2e/tests/login-modal.spec.ts
new file mode 100644
index 00000000..b5593b91
--- /dev/null
+++ b/e2e/tests/login-modal.spec.ts
@@ -0,0 +1,35 @@
+import { test, expect } from "@playwright/test";
+
+const FRAPPE_USER = process.env.FRAPPE_USER || "Administrator";
+const FRAPPE_PASSWORD = process.env.FRAPPE_PASSWORD || "admin";
+
+test.describe("Login Modal", () => {
+	test.use({ storageState: { cookies: [], origins: [] } });
+
+	test("email/password login via modal", async ({ page }) => {
+		await page.goto("/dashboard");
+		await page.waitForLoadState("networkidle");
+		await page.getByRole("button", { name: "Log In" }).first().click();
+		await expect(page.getByRole("dialog")).toBeVisible();
+		await expect(page.getByText("Login to Continue")).toBeVisible();
+		await page.getByLabel("Email").fill(FRAPPE_USER);
+		await page.getByLabel("Password").fill(FRAPPE_PASSWORD);
+		await page.getByRole("button", { name: "Login", exact: true }).click();
+		await expect(page.getByRole("dialog")).not.toBeVisible({ timeout: 10000 });
+		await expect(page.getByRole("button", { name: "Log In" })).not.toBeVisible();
+	});
+
+	test("shows error for invalid credentials", async ({ page }) => {
+		await page.goto("/dashboard");
+		await page.waitForLoadState("networkidle");
+
+		await page.getByRole("button", { name: "Log In" }).first().click();
+		await expect(page.getByRole("dialog")).toBeVisible();
+
+		await page.getByLabel("Email").fill("wrong@example.com");
+		await page.getByLabel("Password").fill("wrongpassword");
+		await page.getByRole("button", { name: "Login", exact: true }).click();
+		await expect(page.getByRole("dialog")).toBeVisible();
+		await expect(page.locator(".bg-surface-red-2")).toBeVisible();
+	});
+});
diff --git a/plans/Completed/login-modal.md b/plans/Completed/login-modal.md
new file mode 100644
index 00000000..80882488
--- /dev/null
+++ b/plans/Completed/login-modal.md
@@ -0,0 +1,60 @@
+# Plan: In-App Login Modal
+
+## Status: Implemented ✓
+
+## Goal
+Replace the redirect to Frappe's `/login` page with an in-app modal dialog that supports all login features. Users stay on the current page (booking, custom form, etc.) and authenticate without leaving context.
+
+## What Was Done
+
+### New Files Created
+1. **`buzz/api/auth.py`** — `get_login_context()` whitelisted API (allow_guest) returning login settings (disable_signup, disable_user_pass_login, login_with_email_link), Google OAuth URL, and login_banner from Buzz Settings
+2. **`dashboard/src/components/LoginDialog.vue`** — Multi-view modal with 4 views: login, signup, forgot-password, email-link. Uses native HTML `<form>` validation with `required` attributes. Each view wrapped in `<form @submit.prevent>`. Google OAuth with SVG icon. Banner with localStorage hash persistence.
+3. **`dashboard/src/composables/useLoginDialog.ts`** — Shared composable with `open(onSuccess?)` and `close()` to control the modal from anywhere
+
+### Files Modified
+1. **`buzz/events/doctype/buzz_settings/buzz_settings.json`** — Added new "Login" tab with `login_banner` Markdown Editor field
+2. **`dashboard/src/App.vue`** — Mounted `<LoginDialog />` globally inside `<FrappeUIProvider>`
+3. **`dashboard/src/layouts/Layout.vue`** — Added auth gate: shows `<LoginRequired />` instead of page content for non-public routes when user is not logged in
+4. **`dashboard/src/components/LoginRequired.vue`** — Changed "Log In" button to open login modal via `useLoginDialog().open()`. Fixed `__()` in `defineProps` default (was causing app crash at module load time before `window.__` was defined)
+5. **`dashboard/src/components/Navbar.vue`** — "Log In" button opens login modal instead of redirecting
+6. **`dashboard/src/components/BookingForm.vue`** — "Log In" link opens login modal. Submit button shows "Login to Checkout" when user is not logged in and event doesn't allow guest booking. On submit with login required, opens login modal with callback to reload page (form data persisted via `useBookingFormStorage` localStorage)
+7. **`dashboard/src/pages/BookTickets.vue`** — Removed `LoginRequired` gate that blocked the entire booking form. Users can now fill in the form and are only prompted to login at checkout time
+8. **`dashboard/src/data/session.ts`** — Removed auto-redirect on login success (modal handles post-login flow). Logout now reloads page instead of redirecting to `/login`
+9. **`dashboard/src/data/user.ts`** — Removed redirect to `/login` on AuthenticationError
+10. **`dashboard/src/router.ts`** — Simplified guard to just fetch user data. Removed redirect to `/login` for unauthenticated users (Layout handles showing LoginRequired). Removed unused `session` import
+11. **`dashboard/src/utils/index.ts`** — Removed unused `redirectToLogin()` function
+
+## Key Behaviors
+
+### Booking Flow (non-guest events)
+- Form shows fully for all users, even unauthenticated
+- Submit button says **"Login to Checkout"** when login is required
+- Clicking it opens the login modal on top of the filled form
+- After login, page reloads — form data is preserved via `useBookingFormStorage` (localStorage)
+
+### Protected Routes (account, bookings, tickets, etc.)
+- Layout shows `LoginRequired` component with "Log In" button
+- Button opens login modal instead of redirecting to Frappe's `/login`
+- After login, page re-renders with authenticated state
+
+### Login Modal Features
+- **Login**: email + password (required, native validation), "Forgot Password?" link
+- **Social OAuth**: "Continue with {Provider}" buttons for all enabled Social Login Keys (shown on both login and signup views)
+- **Email Link**: "Login with Email Link" button (conditional on system setting)
+- **Signup**: full name + email (conditional on disable_signup setting), social login buttons shown here too
+- **Forgot Password**: email field, sends reset link
+- **Banner**: configurable via Buzz Settings → Login tab, always visible when modal opens (no dismiss/timer logic)
+
+### Form Validation
+- All views use `<form @submit.prevent>` with native HTML validation
+- Email fields use `type="email"` + `required`
+- Password field uses `required`
+- Full Name field uses `required` in signup view
+- No custom JS validation for empty checks — browser handles it
+
+## Notes
+
+1. **Social login redirect**: OAuth requires a full page redirect to Google. After auth, Frappe redirects back to `/dashboard`. No way around this.
+2. **`__()` in defineProps**: Using `__()` in prop defaults causes crashes because it runs at module-load time before the translation plugin installs `window.__`. Fixed by using plain strings for defaults and wrapping with `__()` in the template.
+3. **Logout behavior**: Changed from redirecting to `/login` to `window.location.reload()` — the Layout auth gate handles showing LoginRequired after reload.
diff --git a/playwright.config.ts b/playwright.config.ts
index 5948e00c..1746c787 100644
--- a/playwright.config.ts
+++ b/playwright.config.ts
@@ -50,9 +50,18 @@ export default defineConfig({
 			},
 			dependencies: ["setup"],
 		},
+		{
+			name: "login-modal",
+			testMatch: /login-modal\.spec\.ts/,
+			use: {
+				...devices["Desktop Chrome"],
+				storageState: { cookies: [], origins: [] },
+			},
+			dependencies: ["setup"],
+		},
 		{
 			name: "chromium",
-			testIgnore: /guest-booking|custom-forms/,
+			testIgnore: /guest-booking|custom-forms|login-modal/,
 			use: {
 				...devices["Desktop Chrome"],
 				storageState: authFile,