diff --git a/features/auth/pages/signin.templ b/features/auth/pages/signin.templ
--- a/features/auth/pages/signin.templ
+++ b/features/auth/pages/signin.templ
@@ -9,7 +9,7 @@
 // Signin renders the chooser: existing Atmosphere account vs create a new one.
 // next is an optional path to redirect to after sign-in.
 templ Signin(next string) {
-	@layouts.Base("sign in", "Sign in with your ATProto account.") {
+	@layouts.Base("sign in", "Sign in with your Atmosphere (Bluesky) account.") {
 		<div class="window">
 			<div class="window-bar">
 				<div class="dot dot-r"></div>
@@ -22,9 +22,7 @@ <div class="prompt-line">
 					<span class="user">you</span><span class="at">{ "@" }</span><span class="path">atmo.quest</span><span class="sep">:~$</span>
 					<span class="cmd">auth --pick</span>
 				</div>
-				<div class="output indent">choose how to start your quest.</div>
 				<div class="hero-block">
-					<span class="hero-tag">step 1 of 1 · pick a path</span>
 					<h1>sign <span class="quest">in</span></h1>
 					<p class="lede">
 						atmo.quest is built on <span class="kw">ATProto</span>. Your records live in <span class="kw2">your repo</span>, not ours. You'll sign in with the same identity you use anywhere on the open social web.
@@ -33,13 +31,13 @@ </div>
 				<div class="auth-choices">
 					<a href="/signin/atproto" class="auth-card">
 						<div class="auth-card-tag">option a</div>
-						<div class="auth-card-title">sign in with your <span class="kw2">Atmosphere</span> account</div>
+						<div class="auth-card-title">Sign in with your <span class="kw2">Atmosphere (Bluesky)</span> account</div>
 						<div class="auth-card-desc">already have a handle like <code>you.bsky.social</code> or any ATProto PDS? Go this way.</div>
 						<div class="auth-card-cta">▸ continue <span class="shortcut">↵</span></div>
 					</a>
 					<a href={ templ.SafeURL(continueLocalURL(next)) } class="auth-card">
 						<div class="auth-card-tag">option b</div>
-						<div class="auth-card-title">Continue without an <span class="kw2">Atmosphere</span> account</div>
+						<div class="auth-card-title">Continue without an <span class="kw2">Atmosphere (Bluesky)</span> account</div>
 						<div class="auth-card-desc">use atmo.quest locally — link an Atmosphere account later in Settings to claim your data.</div>
 						<div class="auth-card-cta">▸ continue</div>
 					</a>
diff --git a/features/auth/pages/signin_templ.go b/features/auth/pages/signin_templ.go
--- a/features/auth/pages/signin_templ.go
+++ b/features/auth/pages/signin_templ.go
@@ -5,13 +5,12 @@ package pages
 
 //lint:file-ignore SA4006 This context is only used if a nested component is present.
 
-import "github.com/a-h/templ"
-import templruntime "github.com/a-h/templ/runtime"
-
 import (
+	"atmoquest/features/common/layouts"
 	"net/url"
 
-	"atmoquest/features/common/layouts"
+	"github.com/a-h/templ"
+	templruntime "github.com/a-h/templ/runtime"
 )
 
 // Signin renders the chooser: existing Atmosphere account vs create a new one.
@@ -62,7 +61,7 @@ _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var3))
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 2, "</span><span class=\"path\">atmo.quest</span><span class=\"sep\">:~$</span> <span class=\"cmd\">auth --pick</span></div><div class=\"output indent\">choose how to start your quest.</div><div class=\"hero-block\"><span class=\"hero-tag\">step 1 of 1 · pick a path</span><h1>sign <span class=\"quest\">in</span></h1><p class=\"lede\">atmo.quest is built on <span class=\"kw\">ATProto</span>. Your records live in <span class=\"kw2\">your repo</span>, not ours. You'll sign in with the same identity you use anywhere on the open social web.</p></div><div class=\"auth-choices\"><a href=\"/signin/atproto\" class=\"auth-card\"><div class=\"auth-card-tag\">option a</div><div class=\"auth-card-title\">sign in with your <span class=\"kw2\">Atmosphere</span> account</div><div class=\"auth-card-desc\">already have a handle like <code>you.bsky.social</code> or any ATProto PDS? Go this way.</div><div class=\"auth-card-cta\">▸ continue <span class=\"shortcut\">↵</span></div></a> <a href=\"")
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 2, "</span><span class=\"path\">atmo.quest</span><span class=\"sep\">:~$</span> <span class=\"cmd\">auth --pick</span></div><div class=\"hero-block\"><span class=\"hero-tag\">step 1 of 1 · pick a path</span><h1>sign <span class=\"quest\">in</span></h1><p class=\"lede\">atmo.quest is built on <span class=\"kw\">ATProto</span>. Your records live in <span class=\"kw2\">your repo</span>, not ours. You'll sign in with the same identity you use anywhere on the open social web.</p></div><div class=\"auth-choices\"><a href=\"/signin/atproto\" class=\"auth-card\"><div class=\"auth-card-tag\">option a</div><div class=\"auth-card-title\">sign in with your <span class=\"kw2\">Atmosphere</span> account</div><div class=\"auth-card-desc\">already have a handle like <code>you.bsky.social</code> or any ATProto PDS? Go this way.</div><div class=\"auth-card-cta\">▸ continue <span class=\"shortcut\">↵</span></div></a> <a href=\"")
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
diff --git a/features/connect/handlers.go b/features/connect/handlers.go
--- a/features/connect/handlers.go
+++ b/features/connect/handlers.go
@@ -18,6 +18,7 @@ "net/http"
 	"strings"
 	"time"
 
+	"github.com/bluesky-social/indigo/atproto/auth/oauth"
 	"github.com/bluesky-social/indigo/atproto/syntax"
 	"github.com/go-chi/chi/v5"
 
@@ -430,13 +431,16 @@ if raw == "" {
 				continue
 			}
 			if strings.HasPrefix(raw, "local_") {
-				// local→local: write local_connections
-				err := connection.WriteLocal(r.Context(), h.DB, "", identity.DID, "", raw, "")
+				// local→local: write local_connections, linking to either
+				// party's ongoing event and checking the viewer in.
+				eventURI := h.flushEventURI(r.Context(), raw, identity.DID)
+				err := connection.WriteLocal(r.Context(), h.DB, "", identity.DID, "", raw, eventURI)
 				if err != nil {
 					skipped++
 					errs = append(errs, "write failed for "+raw)
 					continue
 				}
+				h.autoCheckinViewer(r.Context(), nil, identity.DID, eventURI)
 				_ = badge.AwardLocal(r.Context(), h.DB, identity.DID, badge.AwardFirstConnect)
 				written++
 			} else {
@@ -446,12 +450,14 @@ if err != nil {
 					skipped++
 					continue
 				}
-				err = connection.WriteLocal(r.Context(), h.DB, "", identity.DID, target.String(), "", "")
+				eventURI := h.flushEventURI(r.Context(), target.String(), identity.DID)
+				err = connection.WriteLocal(r.Context(), h.DB, "", identity.DID, target.String(), "", eventURI)
 				if err != nil {
 					skipped++
 					continue
 				}
-				_ = h.Queue.EnqueueLocal(r.Context(), target, identity.DID, "")
+				_ = h.Queue.EnqueueLocal(r.Context(), target, identity.DID, eventURI)
+				h.autoCheckinViewer(r.Context(), nil, identity.DID, eventURI)
 				_ = badge.AwardLocal(r.Context(), h.DB, identity.DID, badge.AwardFirstConnect)
 				written++
 			}
@@ -479,13 +485,15 @@ continue // silently skip self
 				}
 
 				viewerDIDStr := viewerDID.String()
-				err := connection.WriteLocal(r.Context(), h.DB, viewerDIDStr, "", "", raw, "")
+				eventURI := h.flushEventURI(r.Context(), raw, viewerDIDStr)
+				err := connection.WriteLocal(r.Context(), h.DB, viewerDIDStr, "", "", raw, eventURI)
 				if err != nil {
 					slog.Warn("flush-local: write local connection", "target", raw, "err", err)
 					skipped++
 					errs = append(errs, "write failed for "+raw)
 					continue
 				}
+				h.autoCheckinViewer(r.Context(), viewerSess, viewerDIDStr, eventURI)
 				_ = badge.AwardLocal(r.Context(), h.DB, viewerDIDStr, badge.AwardFirstConnect)
 				written++
 				continue
@@ -500,22 +508,27 @@ }
 			if target == viewerDID {
 				continue
 			}
+			// Link to the target's ongoing event (fall back to the viewer's)
+			// so the replayed connection records the event and checks the
+			// viewer in, exactly as the live /c/{did} handler would have.
+			eventURI := h.flushEventURI(r.Context(), target.String(), viewerDID.String())
 			viewerPDS := h.lookupPDSForDID(r, viewerDID)
-			if connection.HasConnection(r.Context(), viewerPDS, viewerDID, target, "") {
+			if connection.HasConnection(r.Context(), viewerPDS, viewerDID, target, eventURI) {
 				skipped++
 				continue
 			}
-			if _, _, err := connection.Put(r.Context(), viewerSess, h.DB, connection.Record{With: target}); err != nil {
+			if _, _, err := connection.Put(r.Context(), viewerSess, h.DB, connection.Record{With: target, EventURI: eventURI}); err != nil {
 				slog.Warn("flush-local: viewer record", "target", target.String(), "err", err)
 				skipped++
 				errs = append(errs, "write failed for "+target.String())
 				continue
 			}
-			if err := h.Queue.Enqueue(r.Context(), target, viewerDID, ""); err != nil {
+			if err := h.Queue.Enqueue(r.Context(), target, viewerDID, eventURI); err != nil {
 				slog.Warn("flush-local: enqueue", "target", target.String(), "err", err)
 			}
+			h.autoCheckinViewer(r.Context(), viewerSess, viewerDID.String(), eventURI)
 			// Award first-connect badge (idempotent).
-			if _, err := badge.Award(r.Context(), viewerSess, h.DB, badge.AwardFirstConnect, ""); err != nil {
+			if _, err := badge.Award(r.Context(), viewerSess, h.DB, badge.AwardFirstConnect, eventURI); err != nil {
 				slog.Info("flush-local: first-connect badge", "err", err)
 			}
 			written++
@@ -552,6 +565,50 @@ if ev, err := event.Get(ctx, h.DB, evURI); err == nil && ev.IsOngoing(time.Now()) {
 		return evURI
 	}
 	return ""
+}
+
+// flushEventURI resolves the ongoing event tying a flushed connection to a
+// check-in: prefer the scanned target's current event, fall back to the
+// viewer's, mirroring the live /c/{did} handler. Returns "" if neither party
+// is at an ongoing event. targetID/viewerID may be ATProto DIDs or local_xxx
+// IDs (the underlying checkin lookup keys on the string id).
+func (h *Handlers) flushEventURI(ctx context.Context, targetID, viewerID string) string {
+	if ev := h.ongoingEventURI(ctx, targetID); ev != "" {
+		return ev
+	}
+	return h.ongoingEventURI(ctx, viewerID)
+}
+
+// autoCheckinViewer checks the viewer into eventURI and records the
+// event-attendance side effects (attendee badge + event stats), mirroring the
+// auto-checkin the live /c/{did} handler performs so a connection replayed
+// through flush-local also checks the viewer in. A non-nil sess writes the
+// check-in through the viewer's PDS; a nil sess means a local viewer whose
+// check-in is written straight to the local cache keyed on viewerID. No-op
+// when eventURI is "".
+func (h *Handlers) autoCheckinViewer(ctx context.Context, sess *oauth.ClientSession, viewerID, eventURI string) {
+	if eventURI == "" {
+		return
+	}
+	if sess != nil {
+		if _, err := checkin.Put(ctx, sess, h.DB, eventURI, time.Time{}); err != nil {
+			slog.Warn("flush-local: auto-checkin", "event_uri", eventURI, "err", err)
+		}
+		if _, err := badge.Award(ctx, sess, h.DB, badge.AwardEventAttendee, eventURI); err != nil {
+			slog.Info("flush-local: event-attendee badge", "err", err)
+		}
+	} else {
+		if err := checkin.PutLocal(ctx, h.DB, viewerID, eventURI, time.Time{}); err != nil {
+			slog.Warn("flush-local: auto-checkin local", "event_uri", eventURI, "err", err)
+		}
+		_ = badge.AwardLocal(ctx, h.DB, viewerID, badge.AwardEventAttendee)
+	}
+	if err := event.IncrementCheckins(ctx, h.DB, eventURI); err != nil {
+		slog.Info("flush-local: increment checkins", "err", err)
+	}
+	if err := event.IncrementConnectors(ctx, h.DB, eventURI); err != nil {
+		slog.Info("flush-local: increment connectors", "err", err)
+	}
 }
 
 // lookupPDSForDID returns the PDS host for the given DID, using whatever we
diff --git a/features/connect/handlers_test.go b/features/connect/handlers_test.go
new file mode 100644
--- /dev/null
+++ b/features/connect/handlers_test.go
@@ -0,0 +1,127 @@
+package connect
+
+import (
+	"context"
+	"net/http"
+	"net/http/httptest"
+	"path/filepath"
+	"strings"
+	"testing"
+	"time"
+
+	"atmoquest/config"
+	"atmoquest/features/auth"
+	"atmoquest/internal/checkin"
+	"atmoquest/internal/connection"
+	atdb "atmoquest/internal/db"
+	"atmoquest/internal/session"
+
+	"database/sql"
+)
+
+// newTestHandlers wires a connect.Handlers backed by a fresh in-temp-dir DB and
+// a session manager that only needs to read the local cookie (no OAuth).
+func newTestHandlers(t *testing.T) (*Handlers, *sql.DB) {
+	t.Helper()
+	dir := t.TempDir()
+	dsn := "file:" + filepath.Join(dir, "test.db") + "?_pragma=journal_mode(WAL)&_pragma=foreign_keys(ON)"
+	conn, err := atdb.Open(dsn)
+	if err != nil {
+		t.Fatalf("open db: %v", err)
+	}
+	t.Cleanup(func() { _ = conn.Close() })
+	if err := atdb.Migrate(conn); err != nil {
+		t.Fatalf("migrate: %v", err)
+	}
+
+	mgr, err := session.New(&config.Config{
+		Environment:   config.Dev,
+		SessionSecret: "0123456789abcdef0123456789abcdef",
+		PublicURL:     "http://127.0.0.1:8080",
+	})
+	if err != nil {
+		t.Fatalf("session.New: %v", err)
+	}
+	authH := &auth.Handlers{DB: conn, Sessions: mgr}
+	return NewHandlers(conn, authH, connection.NewQueue(conn)), conn
+}
+
+// seedOngoingEvent inserts an events row whose window contains now, plus a
+// check-in tying `attendeeDID` to it, so the user counts as "at the event".
+func seedOngoingEvent(t *testing.T, db *sql.DB, eventURI, attendeeDID string) {
+	t.Helper()
+	ctx := context.Background()
+	now := time.Now().UTC()
+	_, err := db.ExecContext(ctx, `
+		INSERT INTO events (uri, name, start_time, end_time)
+		VALUES (?, 'Test Event', ?, ?)
+	`, eventURI, now.Add(-time.Hour), now.Add(time.Hour))
+	if err != nil {
+		t.Fatalf("seed event: %v", err)
+	}
+	_, err = db.ExecContext(ctx, `
+		INSERT INTO checkins (record_uri, did, event_uri, checked_in_at)
+		VALUES (?, ?, ?, ?)
+	`, "rec://"+attendeeDID, attendeeDID, eventURI, now)
+	if err != nil {
+		t.Fatalf("seed checkin: %v", err)
+	}
+}
+
+// TestConnectFlushLocal_ChecksInLocalViewerToTargetEvent reproduces the bug: a
+// not-logged-in user scans an ATProto user's QR while that user is checked into
+// an ongoing event. The target is stashed in localStorage and replayed through
+// /connect/flush-local after sign-in. The connection record should be created
+// AND the viewer should be auto-checked into the target's current event.
+func TestConnectFlushLocal_ChecksInLocalViewerToTargetEvent(t *testing.T) {
+	h, db := newTestHandlers(t)
+	ctx := context.Background()
+
+	const (
+		viewerLocalID = "local_viewer1"
+		targetDID     = "did:plc:aaaaaaaaaaaaaaaaaaaaaaaa"
+		eventURI      = "at://did:plc:org/quest.atmo.event/evt1"
+	)
+
+	// Target must exist in users (local_connections.target_did FK) and be at
+	// an ongoing event.
+	if _, err := db.ExecContext(ctx,
+		`INSERT INTO users (did, handle) VALUES (?, 'target.test')`, targetDID); err != nil {
+		t.Fatalf("seed target user: %v", err)
+	}
+	seedOngoingEvent(t, db, eventURI, targetDID)
+
+	req := httptest.NewRequest(http.MethodPost, "/connect/flush-local",
+		strings.NewReader(`{"targets":["`+targetDID+`"]}`))
+	req.Header.Set("Content-Type", "application/json")
+	req.AddCookie(&http.Cookie{Name: "atmoquest_local", Value: viewerLocalID})
+	rr := httptest.NewRecorder()
+
+	h.ConnectFlushLocal(rr, req)
+
+	if rr.Code != http.StatusOK {
+		t.Fatalf("status = %d, want 200; body=%s", rr.Code, rr.Body.String())
+	}
+
+	// The viewer should now be checked into the target's event.
+	evURI, ok, err := checkin.CurrentForLocal(ctx, db, viewerLocalID)
+	if err != nil {
+		t.Fatalf("lookup viewer checkin: %v", err)
+	}
+	if !ok || evURI != eventURI {
+		t.Fatalf("viewer checkin = (%q, %v), want (%q, true)", evURI, ok, eventURI)
+	}
+
+	// And the connection record should be linked to that event.
+	var connEvent string
+	err = db.QueryRowContext(ctx, `
+		SELECT event_uri FROM local_connections
+		WHERE viewer_local_id = ? AND target_did = ?
+	`, viewerLocalID, targetDID).Scan(&connEvent)
+	if err != nil {
+		t.Fatalf("query local_connection: %v", err)
+	}
+	if connEvent != eventURI {
+		t.Errorf("connection event_uri = %q, want %q", connEvent, eventURI)
+	}
+}
diff --git a/features/index/pages/index.templ b/features/index/pages/index.templ
--- a/features/index/pages/index.templ
+++ b/features/index/pages/index.templ
@@ -262,7 +262,7 @@ </div>
 
 				<div class="hero-block">
 					<span class="hero-tag">Find your people in the Atmosphere.</span>
-					<h1>atmo<span class="quest">.quest</span><span class="cursor">&nbsp;</span></h1>
+					<h1>atmo<span class="quest">.quest</span></h1>
 					<p class="lede">
 						An <span class="kw">event companion</span> { "for" } the open social web. Scan a QR, write a note, leave with a real follow-up list. Your data goes to <span class="kw2">your repo</span>, not ours.
 					</p>
diff --git a/features/index/pages/index_templ.go b/features/index/pages/index_templ.go
--- a/features/index/pages/index_templ.go
+++ b/features/index/pages/index_templ.go
@@ -5,11 +5,11 @@ package pages
 
 //lint:file-ignore SA4006 This context is only used if a nested component is present.
 
-import "github.com/a-h/templ"
-import templruntime "github.com/a-h/templ/runtime"
-
 import (
 	"atmoquest/features/common/layouts"
+
+	"github.com/a-h/templ"
+	templruntime "github.com/a-h/templ/runtime"
 )
 
 // IndexView passes session-aware values into the landing page. When a user
@@ -693,7 +693,7 @@ _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var28))
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 51, "</span><span class=\"path\">cascadiajs</span><span class=\"sep\">:~$</span> <span class=\"cmd\">whoami</span></div><div class=\"hero-block\"><span class=\"hero-tag\">Find your people in the Atmosphere.</span><h1>atmo<span class=\"quest\">.quest</span><span class=\"cursor\">&nbsp;</span></h1><p class=\"lede\">An <span class=\"kw\">event companion</span> ")
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 51, "</span><span class=\"path\">cascadiajs</span><span class=\"sep\">:~$</span> <span class=\"cmd\">whoami</span></div><div class=\"hero-block\"><span class=\"hero-tag\">Find your people in the Atmosphere.</span><h1>atmo<span class=\"quest\">.quest</span></h1><p class=\"lede\">An <span class=\"kw\">event companion</span> ")
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}