Fix admin user email visibility

.build_number

@@ -1 +1 @@
-0203262044
+0403261321

backend/app/auth.py

@@ -108,6 +108,7 @@ def _load_current_user_from_token(
 
     return {
         "username": user["username"],
+        "email": user.get("email"),
         "role": user["role"],
         "auth_provider": user.get("auth_provider", "local"),
         "jellyseerr_user_id": user.get("jellyseerr_user_id"),

backend/app/config.py

@@ -9,6 +9,9 @@ class Settings(BaseSettings):
     app_name: str = "Magent"
     cors_allow_origin: str = "http://localhost:3000"
     sqlite_path: str = Field(default="data/magent.db", validation_alias=AliasChoices("SQLITE_PATH"))
+    sqlite_journal_mode: str = Field(
+        default="DELETE", validation_alias=AliasChoices("SQLITE_JOURNAL_MODE")
+    )
     jwt_secret: str = Field(default="change-me", validation_alias=AliasChoices("JWT_SECRET"))
     jwt_exp_minutes: int = Field(default=720, validation_alias=AliasChoices("JWT_EXP_MINUTES"))
     api_docs_enabled: bool = Field(default=False, validation_alias=AliasChoices("API_DOCS_ENABLED"))
@@ -21,6 +24,15 @@ class Settings(BaseSettings):
     auth_rate_limit_max_attempts_user: int = Field(
         default=5, validation_alias=AliasChoices("AUTH_RATE_LIMIT_MAX_ATTEMPTS_USER")
     )
+    password_reset_rate_limit_window_seconds: int = Field(
+        default=300, validation_alias=AliasChoices("PASSWORD_RESET_RATE_LIMIT_WINDOW_SECONDS")
+    )
+    password_reset_rate_limit_max_attempts_ip: int = Field(
+        default=6, validation_alias=AliasChoices("PASSWORD_RESET_RATE_LIMIT_MAX_ATTEMPTS_IP")
+    )
+    password_reset_rate_limit_max_attempts_identifier: int = Field(
+        default=3, validation_alias=AliasChoices("PASSWORD_RESET_RATE_LIMIT_MAX_ATTEMPTS_IDENTIFIER")
+    )
     admin_username: str = Field(default="admin", validation_alias=AliasChoices("ADMIN_USERNAME"))
     admin_password: str = Field(default="adminadmin", validation_alias=AliasChoices("ADMIN_PASSWORD"))
     log_level: str = Field(default="INFO", validation_alias=AliasChoices("LOG_LEVEL"))
@@ -71,6 +83,18 @@ class Settings(BaseSettings):
     site_banner_tone: str = Field(
         default="info", validation_alias=AliasChoices("SITE_BANNER_TONE")
     )
+    site_login_show_jellyfin_login: bool = Field(
+        default=True, validation_alias=AliasChoices("SITE_LOGIN_SHOW_JELLYFIN_LOGIN")
+    )
+    site_login_show_local_login: bool = Field(
+        default=True, validation_alias=AliasChoices("SITE_LOGIN_SHOW_LOCAL_LOGIN")
+    )
+    site_login_show_forgot_password: bool = Field(
+        default=True, validation_alias=AliasChoices("SITE_LOGIN_SHOW_FORGOT_PASSWORD")
+    )
+    site_login_show_signup_link: bool = Field(
+        default=True, validation_alias=AliasChoices("SITE_LOGIN_SHOW_SIGNUP_LINK")
+    )
     site_changelog: Optional[str] = Field(default=CHANGELOG)
 
     magent_application_url: Optional[str] = Field(

backend/app/main.py

@@ -163,6 +163,21 @@ def _launch_background_task(name: str, coroutine_factory: Callable[[], Awaitable
     _background_tasks.append(task)
 
 
+def _log_security_configuration_warnings() -> None:
+    if str(settings.jwt_secret or "").strip() == "change-me":
+        logger.warning(
+            "security configuration warning: JWT_SECRET is still set to the default value"
+        )
+    if str(settings.admin_password or "") == "adminadmin":
+        logger.warning(
+            "security configuration warning: ADMIN_PASSWORD is still set to the bootstrap default"
+        )
+    if bool(settings.api_docs_enabled):
+        logger.warning(
+            "security configuration warning: API docs are enabled; disable API_DOCS_ENABLED outside controlled environments"
+        )
+
+
 @app.on_event("startup")
 async def startup() -> None:
     configure_logging(
@@ -174,6 +189,7 @@ async def startup() -> None:
         log_background_sync_level=settings.log_background_sync_level,
     )
     logger.info("startup begin app=%s build=%s", settings.app_name, settings.site_build_number)
+    _log_security_configuration_warnings()
     init_db()
     runtime = get_runtime_settings()
     configure_logging(

backend/app/routers/admin.py

@@ -41,6 +41,7 @@ from ..db import (
     delete_user_activity_by_username,
     set_user_auto_search_enabled,
     set_auto_search_enabled_for_non_admin_users,
+    set_user_email,
     set_user_invite_management_enabled,
     set_invite_management_enabled_for_non_admin_users,
     set_user_profile_id,
@@ -78,6 +79,8 @@ from ..clients.jellyseerr import JellyseerrClient
 from ..services.jellyfin_sync import sync_jellyfin_users
 from ..services.user_cache import (
     build_jellyseerr_candidate_map,
+    extract_jellyseerr_user_email,
+    find_matching_jellyseerr_user,
     get_cached_jellyfin_users,
     get_cached_jellyseerr_users,
     match_jellyseerr_user_id,
@@ -85,9 +88,11 @@ from ..services.user_cache import (
     save_jellyseerr_users_cache,
     clear_user_import_caches,
 )
+from ..security import validate_password_policy
 from ..services.invite_email import (
     TEMPLATE_KEYS as INVITE_EMAIL_TEMPLATE_KEYS,
     get_invite_email_templates,
+    normalize_delivery_email,
     reset_invite_email_template,
     save_invite_email_template,
     send_test_email,
@@ -106,6 +111,16 @@ events_router = APIRouter(prefix="/admin/events", tags=["admin"])
 logger = logging.getLogger(__name__)
 SELF_SERVICE_INVITE_MASTER_ID_KEY = "self_service_invite_master_id"
 
+
+def _require_recipient_email(value: object) -> str:
+    normalized = normalize_delivery_email(value)
+    if normalized:
+        return normalized
+    raise HTTPException(
+        status_code=400,
+        detail="recipient_email is required and must be a valid email address",
+    )
+
 SENSITIVE_KEYS = {
     "magent_ssl_certificate_pem",
     "magent_ssl_private_key_pem",
@@ -215,6 +230,10 @@ SETTING_KEYS: List[str] = [
     "site_banner_enabled",
     "site_banner_message",
     "site_banner_tone",
+    "site_login_show_jellyfin_login",
+    "site_login_show_local_login",
+    "site_login_show_forgot_password",
+    "site_login_show_signup_link",
 ]
 
 
@@ -816,8 +835,12 @@ async def jellyseerr_users_sync() -> Dict[str, Any]:
             continue
         username = user.get("username") or ""
         matched_id = match_jellyseerr_user_id(username, candidate_to_id)
+        matched_seerr_user = find_matching_jellyseerr_user(username, jellyseerr_users)
+        matched_email = extract_jellyseerr_user_email(matched_seerr_user)
         if matched_id is not None:
             set_user_jellyseerr_id(username, matched_id)
+            if matched_email:
+                set_user_email(username, matched_email)
             updated += 1
         else:
             skipped += 1
@@ -854,10 +877,12 @@ async def jellyseerr_users_resync() -> Dict[str, Any]:
         username = _pick_jellyseerr_username(user)
         if not username:
             continue
+        email = extract_jellyseerr_user_email(user)
         created = create_user_if_missing(
             username,
             "jellyseerr-user",
             role="user",
+            email=email,
             auth_provider="jellyseerr",
             jellyseerr_user_id=user_id,
         )
@@ -865,6 +890,8 @@ async def jellyseerr_users_resync() -> Dict[str, Any]:
             imported += 1
         else:
             set_user_jellyseerr_id(username, user_id)
+            if email:
+                set_user_email(username, email)
     return {"status": "ok", "imported": imported, "cleared": cleared}
 
 @router.post("/requests/sync")
@@ -1012,6 +1039,7 @@ async def requests_all(
     take: int = 50,
     skip: int = 0,
     days: Optional[int] = None,
+    stage: str = "all",
     user: Dict[str, str] = Depends(get_current_user),
 ) -> Dict[str, Any]:
     if user.get("role") != "admin":
@@ -1021,8 +1049,9 @@ async def requests_all(
     since_iso = None
     if days is not None and int(days) > 0:
         since_iso = (datetime.now(timezone.utc) - timedelta(days=int(days))).isoformat()
-    rows = get_cached_requests(limit=take, offset=skip, since_iso=since_iso)
+    status_codes = requests_router.request_stage_filter_codes(stage)
-    total = get_cached_requests_count(since_iso=since_iso)
+    rows = get_cached_requests(limit=take, offset=skip, since_iso=since_iso, status_codes=status_codes)
+    total = get_cached_requests_count(since_iso=since_iso, status_codes=status_codes)
     results = []
     for row in rows:
         status = row.get("status")
@@ -1452,12 +1481,15 @@ async def update_users_expiry_bulk(payload: Dict[str, Any]) -> Dict[str, Any]:
 @router.post("/users/{username}/password")
 async def update_user_password(username: str, payload: Dict[str, Any]) -> Dict[str, Any]:
     new_password = payload.get("password") if isinstance(payload, dict) else None
-    if not isinstance(new_password, str) or len(new_password.strip()) < 8:
+    if not isinstance(new_password, str):
-        raise HTTPException(status_code=400, detail="Password must be at least 8 characters.")
+        raise HTTPException(status_code=400, detail="Invalid payload")
+    try:
+        new_password_clean = validate_password_policy(new_password)
+    except ValueError as exc:
+        raise HTTPException(status_code=400, detail=str(exc)) from exc
     user = get_user_by_username(username)
     if not user:
         raise HTTPException(status_code=404, detail="User not found")
-    new_password_clean = new_password.strip()
     user = normalize_user_auth_provider(user)
     auth_provider = resolve_user_auth_provider(user)
     if auth_provider == "local":
@@ -1769,7 +1801,7 @@ async def send_invite_email(payload: Dict[str, Any]) -> Dict[str, Any]:
         if invite is None:
             invite = _resolve_user_invite(user)
 
-    recipient_email = _normalize_optional_text(payload.get("recipient_email"))
+    recipient_email = _require_recipient_email(payload.get("recipient_email"))
     message = _normalize_optional_text(payload.get("message"))
     reason = _normalize_optional_text(payload.get("reason"))
 
@@ -1819,7 +1851,7 @@ async def create_invite(payload: Dict[str, Any], current_user: Dict[str, Any] =
     role = _normalize_role_or_none(payload.get("role"))
     max_uses = _parse_optional_positive_int(payload.get("max_uses"), "max_uses")
     expires_at = _parse_optional_expires_at(payload.get("expires_at"))
-    recipient_email = _normalize_optional_text(payload.get("recipient_email"))
+    recipient_email = _require_recipient_email(payload.get("recipient_email"))
     send_email = bool(payload.get("send_email"))
     delivery_message = _normalize_optional_text(payload.get("message"))
     try:

backend/app/routers/auth.py

@@ -19,6 +19,7 @@ from ..db import (
     get_users_by_username_ci,
     set_user_password,
     set_user_jellyseerr_id,
+    set_user_email,
     set_user_auth_provider,
     get_signup_invite_by_code,
     get_signup_invite_by_id,
@@ -39,17 +40,28 @@ from ..db import (
 from ..runtime import get_runtime_settings
 from ..clients.jellyfin import JellyfinClient
 from ..clients.jellyseerr import JellyseerrClient
-from ..security import create_access_token, verify_password
+from ..security import (
+    PASSWORD_POLICY_MESSAGE,
+    create_access_token,
+    validate_password_policy,
+    verify_password,
+)
 from ..security import create_stream_token
 from ..auth import get_current_user, normalize_user_auth_provider, resolve_user_auth_provider
 from ..config import settings
 from ..services.user_cache import (
     build_jellyseerr_candidate_map,
+    extract_jellyseerr_user_email,
+    find_matching_jellyseerr_user,
     get_cached_jellyseerr_users,
     match_jellyseerr_user_id,
     save_jellyfin_users_cache,
 )
-from ..services.invite_email import send_templated_email, smtp_email_config_ready
+from ..services.invite_email import (
+    normalize_delivery_email,
+    send_templated_email,
+    smtp_email_config_ready,
+)
 from ..services.password_reset import (
     PasswordResetUnavailableError,
     apply_password_reset,
@@ -68,6 +80,19 @@ PASSWORD_RESET_GENERIC_MESSAGE = (
 _LOGIN_RATE_LOCK = Lock()
 _LOGIN_ATTEMPTS_BY_IP: dict[str, deque[float]] = defaultdict(deque)
 _LOGIN_ATTEMPTS_BY_USER: dict[str, deque[float]] = defaultdict(deque)
+_RESET_RATE_LOCK = Lock()
+_RESET_ATTEMPTS_BY_IP: dict[str, deque[float]] = defaultdict(deque)
+_RESET_ATTEMPTS_BY_IDENTIFIER: dict[str, deque[float]] = defaultdict(deque)
+
+
+def _require_recipient_email(value: object) -> str:
+    normalized = normalize_delivery_email(value)
+    if normalized:
+        return normalized
+    raise HTTPException(
+        status_code=status.HTTP_400_BAD_REQUEST,
+        detail="recipient_email is required and must be a valid email address.",
+    )
 
 
 def _auth_client_ip(request: Request) -> str:
@@ -86,6 +111,10 @@ def _login_rate_key_user(username: str) -> str:
     return (username or "").strip().lower()[:256] or "<empty>"
 
 
+def _password_reset_rate_key_identifier(identifier: str) -> str:
+    return (identifier or "").strip().lower()[:256] or "<empty>"
+
+
 def _prune_attempts(bucket: deque[float], now: float, window_seconds: int) -> None:
     cutoff = now - window_seconds
     while bucket and bucket[0] < cutoff:
@@ -171,6 +200,57 @@ def _enforce_login_rate_limit(request: Request, username: str) -> None:
         )
 
 
+def _record_password_reset_attempt(request: Request, identifier: str) -> None:
+    now = time.monotonic()
+    window = max(int(settings.password_reset_rate_limit_window_seconds or 300), 1)
+    ip_key = _auth_client_ip(request)
+    identifier_key = _password_reset_rate_key_identifier(identifier)
+    with _RESET_RATE_LOCK:
+        ip_bucket = _RESET_ATTEMPTS_BY_IP[ip_key]
+        identifier_bucket = _RESET_ATTEMPTS_BY_IDENTIFIER[identifier_key]
+        _prune_attempts(ip_bucket, now, window)
+        _prune_attempts(identifier_bucket, now, window)
+        ip_bucket.append(now)
+        identifier_bucket.append(now)
+    logger.info("password reset rate event recorded identifier=%s client=%s", identifier_key, ip_key)
+
+
+def _enforce_password_reset_rate_limit(request: Request, identifier: str) -> None:
+    now = time.monotonic()
+    window = max(int(settings.password_reset_rate_limit_window_seconds or 300), 1)
+    max_ip = max(int(settings.password_reset_rate_limit_max_attempts_ip or 6), 1)
+    max_identifier = max(int(settings.password_reset_rate_limit_max_attempts_identifier or 3), 1)
+    ip_key = _auth_client_ip(request)
+    identifier_key = _password_reset_rate_key_identifier(identifier)
+    with _RESET_RATE_LOCK:
+        ip_bucket = _RESET_ATTEMPTS_BY_IP[ip_key]
+        identifier_bucket = _RESET_ATTEMPTS_BY_IDENTIFIER[identifier_key]
+        _prune_attempts(ip_bucket, now, window)
+        _prune_attempts(identifier_bucket, now, window)
+        exceeded = len(ip_bucket) >= max_ip or len(identifier_bucket) >= max_identifier
+        retry_after = 1
+        if exceeded:
+            retry_candidates = []
+            if ip_bucket:
+                retry_candidates.append(max(1, int(window - (now - ip_bucket[0]))))
+            if identifier_bucket:
+                retry_candidates.append(max(1, int(window - (now - identifier_bucket[0]))))
+            if retry_candidates:
+                retry_after = max(retry_candidates)
+    if exceeded:
+        logger.warning(
+            "password reset rate limit exceeded identifier=%s client=%s retry_after=%s",
+            identifier_key,
+            ip_key,
+            retry_after,
+        )
+        raise HTTPException(
+            status_code=status.HTTP_429_TOO_MANY_REQUESTS,
+            detail="Too many password reset attempts. Try again shortly.",
+            headers={"Retry-After": str(retry_after)},
+        )
+
+
 def _normalize_username(value: str) -> str:
     normalized = value.strip().lower()
     if "@" in normalized:
@@ -219,6 +299,13 @@ def _extract_jellyseerr_user_id(response: dict) -> int | None:
     return None
 
 
+def _extract_jellyseerr_response_email(response: dict) -> str | None:
+    if not isinstance(response, dict):
+        return None
+    user_payload = response.get("user") if isinstance(response.get("user"), dict) else response
+    return extract_jellyseerr_user_email(user_payload)
+
+
 def _extract_http_error_detail(exc: Exception) -> str:
     if isinstance(exc, httpx.HTTPStatusError):
         response = exc.response
@@ -569,6 +656,8 @@ async def jellyfin_login(request: Request, form_data: OAuth2PasswordRequestForm
     preferred_match = _pick_preferred_ci_user_match(ci_matches, username)
     canonical_username = str(preferred_match.get("username") or username) if preferred_match else username
     user = preferred_match or get_user_by_username(username)
+    matched_seerr_user = find_matching_jellyseerr_user(canonical_username, jellyseerr_users or [])
+    matched_email = extract_jellyseerr_user_email(matched_seerr_user)
     _assert_user_can_login(user)
     if user and _has_valid_jellyfin_cache(user, password):
         token = create_access_token(canonical_username, "user")
@@ -597,7 +686,13 @@ async def jellyfin_login(request: Request, form_data: OAuth2PasswordRequestForm
         _record_login_failure(request, username)
         raise HTTPException(status_code=status.HTTP_401_UNAUTHORIZED, detail="Invalid Jellyfin credentials")
     if not preferred_match:
-        create_user_if_missing(canonical_username, "jellyfin-user", role="user", auth_provider="jellyfin")
+        create_user_if_missing(
+            canonical_username,
+            "jellyfin-user",
+            role="user",
+            email=matched_email,
+            auth_provider="jellyfin",
+        )
     elif (
         user
         and str(user.get("role") or "user").strip().lower() != "admin"
@@ -605,6 +700,8 @@ async def jellyfin_login(request: Request, form_data: OAuth2PasswordRequestForm
     ):
         set_user_auth_provider(canonical_username, "jellyfin")
         user = get_user_by_username(canonical_username)
+    if matched_email:
+        set_user_email(canonical_username, matched_email)
     user = get_user_by_username(canonical_username)
     _assert_user_can_login(user)
     try:
@@ -660,6 +757,7 @@ async def jellyseerr_login(request: Request, form_data: OAuth2PasswordRequestFor
         _record_login_failure(request, form_data.username)
         raise HTTPException(status_code=status.HTTP_401_UNAUTHORIZED, detail="Invalid Seerr credentials")
     jellyseerr_user_id = _extract_jellyseerr_user_id(response)
+    jellyseerr_email = _extract_jellyseerr_response_email(response)
     ci_matches = get_users_by_username_ci(form_data.username)
     preferred_match = _pick_preferred_ci_user_match(ci_matches, form_data.username)
     canonical_username = str(preferred_match.get("username") or form_data.username) if preferred_match else form_data.username
@@ -668,13 +766,22 @@ async def jellyseerr_login(request: Request, form_data: OAuth2PasswordRequestFor
             canonical_username,
             "jellyseerr-user",
             role="user",
+            email=jellyseerr_email,
             auth_provider="jellyseerr",
             jellyseerr_user_id=jellyseerr_user_id,
         )
+    elif (
+        preferred_match
+        and str(preferred_match.get("role") or "user").strip().lower() != "admin"
+        and str(preferred_match.get("auth_provider") or "local").strip().lower() not in {"jellyfin", "jellyseerr"}
+    ):
+        set_user_auth_provider(canonical_username, "jellyseerr")
     user = get_user_by_username(canonical_username)
     _assert_user_can_login(user)
     if jellyseerr_user_id is not None:
         set_user_jellyseerr_id(canonical_username, jellyseerr_user_id)
+    if jellyseerr_email:
+        set_user_email(canonical_username, jellyseerr_email)
     token = create_access_token(canonical_username, "user")
     _clear_login_failures(request, form_data.username)
     set_last_login(canonical_username)
@@ -735,11 +842,10 @@ async def signup(payload: dict) -> dict:
         raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail="Invite code is required")
     if not username:
         raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail="Username is required")
-    if len(password.strip()) < 8:
+    try:
-        raise HTTPException(
+        password_value = validate_password_policy(password)
-            status_code=status.HTTP_400_BAD_REQUEST,
+    except ValueError as exc:
-            detail="Password must be at least 8 characters.",
+        raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail=str(exc)) from exc
-        )
     if get_user_by_username(username):
         raise HTTPException(status_code=status.HTTP_409_CONFLICT, detail="User already exists")
     logger.info(
@@ -786,7 +892,6 @@ async def signup(payload: dict) -> dict:
         expires_at = (datetime.now(timezone.utc) + timedelta(days=account_expires_days)).isoformat()
 
     runtime = get_runtime_settings()
-    password_value = password.strip()
     auth_provider = "local"
     local_password_value = password_value
     matched_jellyseerr_user_id: int | None = None
@@ -839,6 +944,7 @@ async def signup(payload: dict) -> dict:
             username,
             local_password_value,
             role=role,
+            email=normalize_delivery_email(invite.get("recipient_email")) if isinstance(invite, dict) else None,
             auth_provider=auth_provider,
             jellyseerr_user_id=matched_jellyseerr_user_id,
             auto_search_enabled=auto_search_enabled,
@@ -901,6 +1007,8 @@ async def forgot_password(payload: dict, request: Request) -> dict:
     identifier = payload.get("identifier") or payload.get("username") or payload.get("email")
     if not isinstance(identifier, str) or not identifier.strip():
         raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail="Username or email is required.")
+    _enforce_password_reset_rate_limit(request, identifier)
+    _record_password_reset_attempt(request, identifier)
 
     ready, detail = smtp_email_config_ready()
     if not ready:
@@ -960,14 +1068,15 @@ async def password_reset(payload: dict) -> dict:
     new_password = payload.get("new_password")
     if not isinstance(token, str) or not token.strip():
         raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail="Reset token is required.")
-    if not isinstance(new_password, str) or len(new_password.strip()) < 8:
+    if not isinstance(new_password, str):
-        raise HTTPException(
+        raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail=PASSWORD_POLICY_MESSAGE)
-            status_code=status.HTTP_400_BAD_REQUEST,
+    try:
-            detail="Password must be at least 8 characters.",
+        new_password_clean = validate_password_policy(new_password)
-        )
+    except ValueError as exc:
+        raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail=str(exc)) from exc
 
     try:
-        result = await apply_password_reset(token.strip(), new_password.strip())
+        result = await apply_password_reset(token.strip(), new_password_clean)
     except PasswordResetUnavailableError as exc:
         raise HTTPException(status_code=status.HTTP_503_SERVICE_UNAVAILABLE, detail=str(exc)) from exc
     except ValueError as exc:
@@ -1065,8 +1174,7 @@ async def create_profile_invite(payload: dict, current_user: dict = Depends(get_
         label = str(label).strip() or None
     if description is not None:
         description = str(description).strip() or None
-    if recipient_email is not None:
+    recipient_email = _require_recipient_email(recipient_email)
-        recipient_email = str(recipient_email).strip() or None
     send_email = bool(payload.get("send_email"))
     delivery_message = str(payload.get("message") or "").strip() or None
 
@@ -1156,8 +1264,7 @@ async def update_profile_invite(
         label = str(label).strip() or None
     if description is not None:
         description = str(description).strip() or None
-    if recipient_email is not None:
+    recipient_email = _require_recipient_email(recipient_email)
-        recipient_email = str(recipient_email).strip() or None
     send_email = bool(payload.get("send_email"))
     delivery_message = str(payload.get("message") or "").strip() or None
 
@@ -1232,14 +1339,13 @@ async def change_password(payload: dict, current_user: dict = Depends(get_curren
     new_password = payload.get("new_password") if isinstance(payload, dict) else None
     if not isinstance(current_password, str) or not isinstance(new_password, str):
         raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail="Invalid payload")
-    if len(new_password.strip()) < 8:
+    try:
-        raise HTTPException(
+        new_password_clean = validate_password_policy(new_password)
-            status_code=status.HTTP_400_BAD_REQUEST, detail="Password must be at least 8 characters."
+    except ValueError as exc:
-        )
+        raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail=str(exc)) from exc
     username = str(current_user.get("username") or "").strip()
     if not username:
         raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail="Invalid user")
-    new_password_clean = new_password.strip()
     stored_user = normalize_user_auth_provider(get_user_by_username(username))
     auth_provider = resolve_user_auth_provider(stored_user or current_user)
     logger.info("password change requested username=%s provider=%s", username, auth_provider)

backend/app/routers/events.py

@@ -76,6 +76,7 @@ def _request_actions_brief(entries: Any) -> list[dict[str, Any]]:
 async def events_stream(
     request: Request,
     recent_days: int = 90,
+    recent_stage: str = "all",
     user: Dict[str, Any] = Depends(get_current_user_event_stream),
 ) -> StreamingResponse:
     recent_days = max(0, min(int(recent_days or 90), 3650))
@@ -103,6 +104,7 @@ async def events_stream(
                         take=recent_take,
                         skip=0,
                         days=recent_days,
+                        stage=recent_stage,
                         user=user,
                     )
                     results = recent_payload.get("results") if isinstance(recent_payload, dict) else []
@@ -110,6 +112,7 @@ async def events_stream(
                         "type": "home_recent",
                         "ts": datetime.now(timezone.utc).isoformat(),
                         "days": recent_days,
+                        "stage": recent_stage,
                         "results": results if isinstance(results, list) else [],
                     }
                 except Exception as exc:
@@ -117,6 +120,7 @@ async def events_stream(
                         "type": "home_recent",
                         "ts": datetime.now(timezone.utc).isoformat(),
                         "days": recent_days,
+                        "stage": recent_stage,
                         "error": str(exc),
                     }
                 signature = json.dumps(payload, ensure_ascii=True, separators=(",", ":"), default=str)

backend/app/routers/requests.py

@@ -26,7 +26,7 @@ from ..db import (
     get_cached_requests,
     get_cached_requests_since,
     get_cached_request_by_media_id,
-    get_request_cache_by_id,
+    get_request_cache_lookup,
     get_request_cache_payload,
     get_request_cache_last_updated,
     get_request_cache_count,
@@ -35,7 +35,9 @@ from ..db import (
     repair_request_cache_titles,
     prune_duplicate_requests_cache,
     upsert_request_cache,
+    upsert_request_cache_many,
     upsert_artwork_cache_status,
+    upsert_artwork_cache_status_many,
     get_artwork_cache_missing_count,
     get_artwork_cache_status_count,
     get_setting,
@@ -47,7 +49,7 @@ from ..db import (
     clear_seerr_media_failure,
 )
 from ..models import Snapshot, TriageResult, RequestType
-from ..services.snapshot import build_snapshot
+from ..services.snapshot import build_snapshot, jellyfin_item_matches_request
 
 router = APIRouter(prefix="/requests", tags=["requests"], dependencies=[Depends(get_current_user)])
 
@@ -91,6 +93,17 @@ STATUS_LABELS = {
     6: "Partially ready",
 }
 
+REQUEST_STAGE_CODES = {
+    "all": None,
+    "pending": [1],
+    "approved": [2],
+    "declined": [3],
+    "ready": [4],
+    "working": [5],
+    "partial": [6],
+    "in_progress": [2, 5, 6],
+}
+
 
 def _cache_get(key: str) -> Optional[Dict[str, Any]]:
     cached = _detail_cache.get(key)
@@ -105,6 +118,57 @@ def _cache_get(key: str) -> Optional[Dict[str, Any]]:
 
 def _cache_set(key: str, payload: Dict[str, Any]) -> None:
     _detail_cache[key] = (time.time() + CACHE_TTL_SECONDS, payload)
+
+
+def _status_label_with_jellyfin(current_status: Any, jellyfin_available: bool) -> str:
+    if not jellyfin_available:
+        return _status_label(current_status)
+    try:
+        status_code = int(current_status)
+    except (TypeError, ValueError):
+        status_code = None
+    if status_code == 6:
+        return STATUS_LABELS[6]
+    return STATUS_LABELS[4]
+
+
+async def _request_is_available_in_jellyfin(
+    jellyfin: JellyfinClient,
+    title: Optional[str],
+    year: Optional[int],
+    media_type: Optional[str],
+    request_payload: Optional[Dict[str, Any]],
+    availability_cache: Dict[str, bool],
+) -> bool:
+    if not jellyfin.configured() or not title:
+        return False
+    cache_key = f"{media_type or ''}:{title.lower()}:{year or ''}:{request_payload.get('id') if isinstance(request_payload, dict) else ''}"
+    cached_value = availability_cache.get(cache_key)
+    if cached_value is not None:
+        return cached_value
+    types = ["Movie"] if media_type == "movie" else ["Series"]
+    try:
+        search = await jellyfin.search_items(title, types, limit=50)
+    except Exception:
+        availability_cache[cache_key] = False
+        return False
+    if isinstance(search, dict):
+        items = search.get("Items") or search.get("items") or []
+        request_type = RequestType.movie if media_type == "movie" else RequestType.tv
+        for item in items:
+            if not isinstance(item, dict):
+                continue
+            if jellyfin_item_matches_request(
+                item,
+                title=title,
+                year=year,
+                request_type=request_type,
+                request_payload=request_payload,
+            ):
+                availability_cache[cache_key] = True
+                return True
+    availability_cache[cache_key] = False
+    return False
     _failed_detail_cache.pop(key, None)
 
 
@@ -152,6 +216,23 @@ def _status_label(value: Any) -> str:
     return "Unknown"
 
 
+def normalize_request_stage_filter(value: Optional[str]) -> str:
+    if not isinstance(value, str):
+        return "all"
+    normalized = value.strip().lower().replace("-", "_").replace(" ", "_")
+    if not normalized:
+        return "all"
+    if normalized in {"processing", "inprogress"}:
+        normalized = "in_progress"
+    return normalized if normalized in REQUEST_STAGE_CODES else "all"
+
+
+def request_stage_filter_codes(value: Optional[str]) -> Optional[list[int]]:
+    normalized = normalize_request_stage_filter(value)
+    codes = REQUEST_STAGE_CODES.get(normalized)
+    return list(codes) if codes else None
+
+
 def _normalize_username(value: Any) -> Optional[str]:
     if not isinstance(value, str):
         return None
@@ -383,26 +464,55 @@ def _upsert_artwork_status(
     poster_cached: Optional[bool] = None,
     backdrop_cached: Optional[bool] = None,
 ) -> None:
+    record = _build_artwork_status_record(payload, cache_mode, poster_cached, backdrop_cached)
+    if not record:
+        return
+    upsert_artwork_cache_status(**record)
+
+
+def _build_request_cache_record(payload: Dict[str, Any], request_payload: Dict[str, Any]) -> Dict[str, Any]:
+    return {
+        "request_id": payload.get("request_id"),
+        "media_id": payload.get("media_id"),
+        "media_type": payload.get("media_type"),
+        "status": payload.get("status"),
+        "title": payload.get("title"),
+        "year": payload.get("year"),
+        "requested_by": payload.get("requested_by"),
+        "requested_by_norm": payload.get("requested_by_norm"),
+        "requested_by_id": payload.get("requested_by_id"),
+        "created_at": payload.get("created_at"),
+        "updated_at": payload.get("updated_at"),
+        "payload_json": json.dumps(request_payload, ensure_ascii=True),
+    }
+
+
+def _build_artwork_status_record(
+    payload: Dict[str, Any],
+    cache_mode: str,
+    poster_cached: Optional[bool] = None,
+    backdrop_cached: Optional[bool] = None,
+) -> Optional[Dict[str, Any]]:
     parsed = _parse_request_payload(payload)
     request_id = parsed.get("request_id")
     if not isinstance(request_id, int):
-        return
+        return None
     tmdb_id, media_type = _extract_tmdb_lookup(payload)
     poster_path, backdrop_path = _extract_artwork_paths(payload)
     has_tmdb = bool(tmdb_id and media_type)
     poster_cached_flag, backdrop_cached_flag = _compute_cached_flags(
         poster_path, backdrop_path, cache_mode, poster_cached, backdrop_cached
     )
-    upsert_artwork_cache_status(
+    return {
-        request_id=request_id,
+        "request_id": request_id,
-        tmdb_id=tmdb_id,
+        "tmdb_id": tmdb_id,
-        media_type=media_type,
+        "media_type": media_type,
-        poster_path=poster_path,
+        "poster_path": poster_path,
-        backdrop_path=backdrop_path,
+        "backdrop_path": backdrop_path,
-        has_tmdb=has_tmdb,
+        "has_tmdb": has_tmdb,
-        poster_cached=poster_cached_flag,
+        "poster_cached": poster_cached_flag,
-        backdrop_cached=backdrop_cached_flag,
+        "backdrop_cached": backdrop_cached_flag,
-    )
+    }
 
 
 def _collect_artwork_cache_disk_stats() -> tuple[int, int]:
@@ -603,6 +713,16 @@ async def _sync_all_requests(client: JellyseerrClient) -> int:
         if not isinstance(items, list) or not items:
             logger.info("Seerr sync completed: no more results at skip=%s", skip)
             break
+        page_request_ids = [
+            payload.get("request_id")
+            for item in items
+            if isinstance(item, dict)
+            for payload in [_parse_request_payload(item)]
+            if isinstance(payload.get("request_id"), int)
+        ]
+        cached_by_request_id = get_request_cache_lookup(page_request_ids)
+        page_cache_records: list[Dict[str, Any]] = []
+        page_artwork_records: list[Dict[str, Any]] = []
         for item in items:
             if not isinstance(item, dict):
                 continue
@@ -610,10 +730,9 @@ async def _sync_all_requests(client: JellyseerrClient) -> int:
             request_id = payload.get("request_id")
             cached_title = None
             if isinstance(request_id, int):
-                if not payload.get("title"):
+                cached = cached_by_request_id.get(request_id)
-                    cached = get_request_cache_by_id(request_id)
+                if not payload.get("title") and cached and cached.get("title"):
-                    if cached and cached.get("title"):
+                    cached_title = cached.get("title")
-                        cached_title = cached.get("title")
                 needs_details = (
                     not payload.get("title")
                     or not payload.get("media_id")
@@ -644,25 +763,17 @@ async def _sync_all_requests(client: JellyseerrClient) -> int:
                     payload["title"] = cached_title
             if not isinstance(payload.get("request_id"), int):
                 continue
-            payload_json = json.dumps(item, ensure_ascii=True)
+            page_cache_records.append(_build_request_cache_record(payload, item))
-            upsert_request_cache(
-                request_id=payload.get("request_id"),
-                media_id=payload.get("media_id"),
-                media_type=payload.get("media_type"),
-                status=payload.get("status"),
-                title=payload.get("title"),
-                year=payload.get("year"),
-                requested_by=payload.get("requested_by"),
-                requested_by_norm=payload.get("requested_by_norm"),
-                requested_by_id=payload.get("requested_by_id"),
-                created_at=payload.get("created_at"),
-                updated_at=payload.get("updated_at"),
-                payload_json=payload_json,
-            )
             if isinstance(item, dict):
-                _upsert_artwork_status(item, cache_mode)
+                artwork_record = _build_artwork_status_record(item, cache_mode)
+                if artwork_record:
+                    page_artwork_records.append(artwork_record)
             stored += 1
             _sync_state["stored"] = stored
+        if page_cache_records:
+            upsert_request_cache_many(page_cache_records)
+        if page_artwork_records:
+            upsert_artwork_cache_status_many(page_artwork_records)
         if len(items) < take:
             logger.info("Seerr sync completed: stored=%s", stored)
             break
@@ -721,6 +832,16 @@ async def _sync_delta_requests(client: JellyseerrClient) -> int:
         if not isinstance(items, list) or not items:
             logger.info("Seerr delta sync completed: no more results at skip=%s", skip)
             break
+        page_request_ids = [
+            payload.get("request_id")
+            for item in items
+            if isinstance(item, dict)
+            for payload in [_parse_request_payload(item)]
+            if isinstance(payload.get("request_id"), int)
+        ]
+        cached_by_request_id = get_request_cache_lookup(page_request_ids)
+        page_cache_records: list[Dict[str, Any]] = []
+        page_artwork_records: list[Dict[str, Any]] = []
         page_changed = False
         for item in items:
             if not isinstance(item, dict):
@@ -728,7 +849,7 @@ async def _sync_delta_requests(client: JellyseerrClient) -> int:
             payload = _parse_request_payload(item)
             request_id = payload.get("request_id")
             if isinstance(request_id, int):
-                cached = get_request_cache_by_id(request_id)
+                cached = cached_by_request_id.get(request_id)
                 incoming_updated = payload.get("updated_at")
                 cached_title = cached.get("title") if cached else None
                 if cached and incoming_updated and cached.get("updated_at") == incoming_updated and cached.get("title"):
@@ -762,26 +883,18 @@ async def _sync_delta_requests(client: JellyseerrClient) -> int:
                     payload["title"] = cached_title
             if not isinstance(payload.get("request_id"), int):
                 continue
-            payload_json = json.dumps(item, ensure_ascii=True)
+            page_cache_records.append(_build_request_cache_record(payload, item))
-            upsert_request_cache(
-                request_id=payload.get("request_id"),
-                media_id=payload.get("media_id"),
-                media_type=payload.get("media_type"),
-                status=payload.get("status"),
-                title=payload.get("title"),
-                year=payload.get("year"),
-                requested_by=payload.get("requested_by"),
-                requested_by_norm=payload.get("requested_by_norm"),
-                requested_by_id=payload.get("requested_by_id"),
-                created_at=payload.get("created_at"),
-                updated_at=payload.get("updated_at"),
-                payload_json=payload_json,
-            )
             if isinstance(item, dict):
-                _upsert_artwork_status(item, cache_mode)
+                artwork_record = _build_artwork_status_record(item, cache_mode)
+                if artwork_record:
+                    page_artwork_records.append(artwork_record)
             stored += 1
             page_changed = True
             _sync_state["stored"] = stored
+        if page_cache_records:
+            upsert_request_cache_many(page_cache_records)
+        if page_artwork_records:
+            upsert_artwork_cache_status_many(page_artwork_records)
         if not page_changed:
             unchanged_pages += 1
         else:
@@ -866,6 +979,8 @@ async def _prefetch_artwork_cache(
             batch = get_request_cache_payloads(limit=limit, offset=offset)
         if not batch:
             break
+        page_cache_records: list[Dict[str, Any]] = []
+        page_artwork_records: list[Dict[str, Any]] = []
         for row in batch:
             payload = row.get("payload")
             if not isinstance(payload, dict):
@@ -893,20 +1008,7 @@ async def _prefetch_artwork_cache(
                     parsed = _parse_request_payload(payload)
                     request_id = parsed.get("request_id")
                     if isinstance(request_id, int):
-                        upsert_request_cache(
+                        page_cache_records.append(_build_request_cache_record(parsed, payload))
-                            request_id=request_id,
-                            media_id=parsed.get("media_id"),
-                            media_type=parsed.get("media_type"),
-                            status=parsed.get("status"),
-                            title=parsed.get("title"),
-                            year=parsed.get("year"),
-                            requested_by=parsed.get("requested_by"),
-                            requested_by_norm=parsed.get("requested_by_norm"),
-                            requested_by_id=parsed.get("requested_by_id"),
-                            created_at=parsed.get("created_at"),
-                            updated_at=parsed.get("updated_at"),
-                            payload_json=json.dumps(payload, ensure_ascii=True),
-                        )
             poster_cached_flag = False
             backdrop_cached_flag = False
             if poster_path:
@@ -921,17 +1023,23 @@ async def _prefetch_artwork_cache(
                     backdrop_cached_flag = bool(await cache_tmdb_image(backdrop_path, "w780"))
                 except httpx.HTTPError:
                     backdrop_cached_flag = False
-            _upsert_artwork_status(
+            artwork_record = _build_artwork_status_record(
                 payload,
                 cache_mode,
                 poster_cached=poster_cached_flag if poster_path else None,
                 backdrop_cached=backdrop_cached_flag if backdrop_path else None,
             )
+            if artwork_record:
+                page_artwork_records.append(artwork_record)
             processed += 1
             if processed % 25 == 0:
                 _artwork_prefetch_state.update(
                     {"processed": processed, "message": f"Cached artwork for {processed} requests"}
                 )
+        if page_cache_records:
+            upsert_request_cache_many(page_cache_records)
+        if page_artwork_records:
+            upsert_artwork_cache_status_many(page_artwork_records)
         offset += limit
 
     total_requests = get_request_cache_count()
@@ -1063,6 +1171,7 @@ def _get_recent_from_cache(
     limit: int,
     offset: int,
     since_iso: Optional[str],
+    status_codes: Optional[list[int]] = None,
 ) -> List[Dict[str, Any]]:
     items = _recent_cache.get("items") or []
     results = []
@@ -1078,6 +1187,8 @@ def _get_recent_from_cache(
             item_dt = _parse_iso_datetime(candidate)
             if not item_dt or item_dt < since_dt:
                 continue
+        if status_codes and item.get("status") not in status_codes:
+            continue
         results.append(item)
     return results[offset : offset + limit]
 
@@ -1235,23 +1346,9 @@ def get_requests_sync_state() -> Dict[str, Any]:
 async def _ensure_request_access(
     client: JellyseerrClient, request_id: int, user: Dict[str, str]
 ) -> None:
-    if user.get("role") == "admin":
+    if user.get("role") == "admin" or user.get("username"):
         return
-    runtime = get_runtime_settings()
+    raise HTTPException(status_code=403, detail="Request not accessible for this user")
-    mode = (runtime.requests_data_source or "prefer_cache").lower()
-    cached = get_request_cache_payload(request_id)
-    if mode != "always_js":
-        if cached is None:
-            logger.debug("access cache miss: request_id=%s mode=%s", request_id, mode)
-            raise HTTPException(status_code=404, detail="Request not found in cache")
-        logger.debug("access cache hit: request_id=%s mode=%s", request_id, mode)
-        if _request_matches_user(cached, user.get("username", "")):
-            return
-        raise HTTPException(status_code=403, detail="Request not accessible for this user")
-    logger.debug("access cache miss: request_id=%s mode=%s", request_id, mode)
-    details = await _get_request_details(client, request_id)
-    if details is None or not _request_matches_user(details, user.get("username", "")):
-        raise HTTPException(status_code=403, detail="Request not accessible for this user")
 
 
 def _build_recent_map(response: Dict[str, Any]) -> Dict[int, Dict[str, Any]]:
@@ -1521,6 +1618,7 @@ async def recent_requests(
     take: int = 6,
     skip: int = 0,
     days: int = 90,
+    stage: str = "all",
     user: Dict[str, str] = Depends(get_current_user),
 ) -> dict:
     runtime = get_runtime_settings()
@@ -1542,44 +1640,22 @@ async def recent_requests(
     since_iso = None
     if days > 0:
         since_iso = (datetime.now(timezone.utc) - timedelta(days=days)).isoformat()
+    status_codes = request_stage_filter_codes(stage)
     if _recent_cache_stale():
         _refresh_recent_cache_from_db()
-    rows = _get_recent_from_cache(requested_by, requested_by_id, take, skip, since_iso)
+    rows = _get_recent_from_cache(
+        requested_by,
+        requested_by_id,
+        take,
+        skip,
+        since_iso,
+        status_codes=status_codes,
+    )
     cache_mode = (runtime.artwork_cache_mode or "remote").lower()
     allow_title_hydrate = False
     allow_artwork_hydrate = client.configured()
     jellyfin = JellyfinClient(runtime.jellyfin_base_url, runtime.jellyfin_api_key)
     jellyfin_cache: Dict[str, bool] = {}
-
-    async def _jellyfin_available(
-        title_value: Optional[str], year_value: Optional[int], media_type_value: Optional[str]
-    ) -> bool:
-        if not jellyfin.configured() or not title_value:
-            return False
-        cache_key = f"{media_type_value or ''}:{title_value.lower()}:{year_value or ''}"
-        cached_value = jellyfin_cache.get(cache_key)
-        if cached_value is not None:
-            return cached_value
-        types = ["Movie"] if media_type_value == "movie" else ["Series"]
-        try:
-            search = await jellyfin.search_items(title_value, types)
-        except Exception:
-            jellyfin_cache[cache_key] = False
-            return False
-        if isinstance(search, dict):
-            items = search.get("Items") or search.get("items") or []
-            for item in items:
-                if not isinstance(item, dict):
-                    continue
-                name = item.get("Name") or item.get("title")
-                year = item.get("ProductionYear") or item.get("Year")
-                if name and name.strip().lower() == title_value.strip().lower():
-                    if year_value and year and int(year) != int(year_value):
-                        continue
-                    jellyfin_cache[cache_key] = True
-                    return True
-        jellyfin_cache[cache_key] = False
-        return False
     results = []
     for row in rows:
         status = row.get("status")
@@ -1674,10 +1750,16 @@ async def recent_requests(
                             payload_json=json.dumps(details, ensure_ascii=True),
                         )
         status_label = _status_label(status)
-        if status_label == "Working on it":
+        if status_label in {"Working on it", "Ready to watch", "Partially ready"}:
-            is_available = await _jellyfin_available(title, year, row.get("media_type"))
+            is_available = await _request_is_available_in_jellyfin(
-            if is_available:
+                jellyfin,
-                status_label = "Available"
+                title,
+                year,
+                row.get("media_type"),
+                details if isinstance(details, dict) else None,
+                jellyfin_cache,
+            )
+            status_label = _status_label_with_jellyfin(status, is_available)
         results.append(
             {
                 "id": row.get("request_id"),
@@ -1721,6 +1803,8 @@ async def search_requests(
         pass
 
     results = []
+    jellyfin = JellyfinClient(runtime.jellyfin_base_url, runtime.jellyfin_api_key)
+    jellyfin_cache: Dict[str, bool] = {}
     for item in response.get("results", []):
         media_type = item.get("mediaType")
         title = item.get("title") or item.get("name")
@@ -1733,6 +1817,8 @@ async def search_requests(
         request_id = None
         status = None
         status_label = None
+        requested_by = None
+        accessible = False
         media_info = item.get("mediaInfo") or {}
         media_info_id = media_info.get("id")
         requests = media_info.get("requests")
@@ -1741,27 +1827,31 @@ async def search_requests(
             status = requests[0].get("status")
             status_label = _status_label(status)
         elif isinstance(media_info_id, int):
-            username_norm = _normalize_username(user.get("username", ""))
-            requested_by_id = user.get("jellyseerr_user_id")
-            requested_by = None if user.get("role") == "admin" else username_norm
-            requested_by_id = None if user.get("role") == "admin" else requested_by_id
             cached = get_cached_request_by_media_id(
                 media_info_id,
-                requested_by_norm=requested_by,
-                requested_by_id=requested_by_id,
             )
             if cached:
                 request_id = cached.get("request_id")
                 status = cached.get("status")
                 status_label = _status_label(status)
 
-        if user.get("role") != "admin":
+        if isinstance(request_id, int):
-            if isinstance(request_id, int):
+            details = get_request_cache_payload(request_id)
+            if not isinstance(details, dict):
                 details = await _get_request_details(client, request_id)
-                if not _request_matches_user(details, user.get("username", "")):
+            if user.get("role") == "admin":
-                    continue
+                requested_by = _request_display_name(details)
-            else:
+            accessible = True
-                continue
+            if status is not None:
+                is_available = await _request_is_available_in_jellyfin(
+                    jellyfin,
+                    title,
+                    year,
+                    media_type,
+                    details if isinstance(details, dict) else None,
+                    jellyfin_cache,
+                )
+                status_label = _status_label_with_jellyfin(status, is_available)
 
         results.append(
             {
@@ -1772,6 +1862,8 @@ async def search_requests(
                 "requestId": request_id,
                 "status": status,
                 "statusLabel": status_label,
+                "requestedBy": requested_by,
+                "accessible": accessible,
             }
         )
 

backend/app/routers/site.py

@@ -24,6 +24,12 @@ def _build_site_info(include_changelog: bool) -> Dict[str, Any]:
             "message": banner_message,
             "tone": tone,
         },
+        "login": {
+            "showJellyfinLogin": bool(runtime.site_login_show_jellyfin_login),
+            "showLocalLogin": bool(runtime.site_login_show_local_login),
+            "showForgotPassword": bool(runtime.site_login_show_forgot_password),
+            "showSignupLink": bool(runtime.site_login_show_signup_link),
+        },
     }
     if include_changelog:
         info["changelog"] = (CHANGELOG or "").strip()

backend/app/runtime.py

@@ -4,6 +4,12 @@ from .db import get_settings_overrides
 _INT_FIELDS = {
     "magent_application_port",
     "magent_api_port",
+    "auth_rate_limit_window_seconds",
+    "auth_rate_limit_max_attempts_ip",
+    "auth_rate_limit_max_attempts_user",
+    "password_reset_rate_limit_window_seconds",
+    "password_reset_rate_limit_max_attempts_ip",
+    "password_reset_rate_limit_max_attempts_identifier",
     "sonarr_quality_profile_id",
     "radarr_quality_profile_id",
     "jwt_exp_minutes",
@@ -29,6 +35,10 @@ _BOOL_FIELDS = {
     "magent_notify_webhook_enabled",
     "jellyfin_sync_to_arr",
     "site_banner_enabled",
+    "site_login_show_jellyfin_login",
+    "site_login_show_local_login",
+    "site_login_show_forgot_password",
+    "site_login_show_signup_link",
 }
 _SKIP_OVERRIDE_FIELDS = {"site_build_number", "site_changelog"}
 

backend/app/security.py

@@ -1,13 +1,16 @@
 from datetime import datetime, timedelta, timezone
 from typing import Any, Dict, Optional
 
-from jose import JWTError, jwt
 from passlib.context import CryptContext
+import jwt
+from jwt import InvalidTokenError
 
 from .config import settings
 
 _pwd_context = CryptContext(schemes=["pbkdf2_sha256"], deprecated="auto")
 _ALGORITHM = "HS256"
+MIN_PASSWORD_LENGTH = 8
+PASSWORD_POLICY_MESSAGE = f"Password must be at least {MIN_PASSWORD_LENGTH} characters."
 
 
 def hash_password(password: str) -> str:
@@ -18,6 +21,13 @@ def verify_password(plain_password: str, hashed_password: str) -> bool:
     return _pwd_context.verify(plain_password, hashed_password)
 
 
+def validate_password_policy(password: str) -> str:
+    candidate = password.strip()
+    if len(candidate) < MIN_PASSWORD_LENGTH:
+        raise ValueError(PASSWORD_POLICY_MESSAGE)
+    return candidate
+
+
 def _create_token(
     subject: str,
     role: str,
@@ -55,5 +65,5 @@ class TokenError(Exception):
 def safe_decode_token(token: str) -> Dict[str, Any]:
     try:
         return decode_token(token)
-    except JWTError as exc:
+    except InvalidTokenError as exc:
         raise TokenError("Invalid token") from exc

backend/app/services/diagnostics.py

@@ -16,7 +16,7 @@ from ..clients.qbittorrent import QBittorrentClient
 from ..clients.radarr import RadarrClient
 from ..clients.sonarr import SonarrClient
 from ..config import settings as env_settings
-from ..db import run_integrity_check
+from ..db import get_database_diagnostics
 from ..runtime import get_runtime_settings
 from .invite_email import send_test_email, smtp_email_config_ready, smtp_email_delivery_warning
 
@@ -205,12 +205,16 @@ async def _run_http_post(
 
 
 async def _run_database_check() -> Dict[str, Any]:
-    integrity = await asyncio.to_thread(run_integrity_check)
+    detail = await asyncio.to_thread(get_database_diagnostics)
+    integrity = _clean_text(detail.get("integrity_check"), "unknown")
+    requests_cached = detail.get("row_counts", {}).get("requests_cache", 0) if isinstance(detail, dict) else 0
+    wal_size_bytes = detail.get("wal_size_bytes", 0) if isinstance(detail, dict) else 0
+    wal_size_megabytes = round((float(wal_size_bytes or 0) / (1024 * 1024)), 2)
     status = "up" if integrity == "ok" else "degraded"
     return {
         "status": status,
-        "message": f"SQLite integrity_check returned {integrity}",
+        "message": f"SQLite {integrity} · {requests_cached} cached requests · WAL {wal_size_megabytes:.2f} MB",
-        "detail": integrity,
+        "detail": detail,
     }
 
 

backend/app/services/invite_email.py

@@ -6,8 +6,13 @@ import json
 import logging
 import re
 import smtplib
+from functools import lru_cache
+from pathlib import Path
+from email.generator import BytesGenerator
 from email.message import EmailMessage
-from email.utils import formataddr
+from email.policy import SMTP as SMTP_POLICY
+from email.utils import formataddr, formatdate, make_msgid
+from io import BytesIO
 from typing import Any, Dict, Optional
 
 from ..build_info import BUILD_NUMBER
@@ -21,6 +26,9 @@ TEMPLATE_SETTING_PREFIX = "invite_email_template_"
 TEMPLATE_KEYS = ("invited", "welcome", "warning", "banned")
 EMAIL_PATTERN = re.compile(r"^[^@\s]+@[^@\s]+\.[^@\s]+$")
 PLACEHOLDER_PATTERN = re.compile(r"{{\s*([a-zA-Z0-9_]+)\s*}}")
+EXCHANGE_MESSAGE_ID_PATTERN = re.compile(r"<([^>]+)>")
+EXCHANGE_INTERNAL_ID_PATTERN = re.compile(r"\[InternalId=([^\],]+)")
+EMAIL_LOGO_CID = "magent-logo"
 
 TEMPLATE_METADATA: Dict[str, Dict[str, Any]] = {
     "invited": {
@@ -60,6 +68,183 @@ TEMPLATE_PLACEHOLDERS = [
     "username",
 ]
 
+EMAIL_TAGLINE = "Find and fix media requests fast."
+
+EMAIL_TONE_STYLES: Dict[str, Dict[str, str]] = {
+    "brand": {
+        "chip_bg": "rgba(255, 107, 43, 0.16)",
+        "chip_border": "rgba(255, 107, 43, 0.38)",
+        "chip_text": "#ffd2bf",
+        "accent_a": "#ff6b2b",
+        "accent_b": "#1c6bff",
+    },
+    "success": {
+        "chip_bg": "rgba(34, 197, 94, 0.16)",
+        "chip_border": "rgba(34, 197, 94, 0.38)",
+        "chip_text": "#c7f9d7",
+        "accent_a": "#22c55e",
+        "accent_b": "#1c6bff",
+    },
+    "warning": {
+        "chip_bg": "rgba(251, 146, 60, 0.16)",
+        "chip_border": "rgba(251, 146, 60, 0.38)",
+        "chip_text": "#ffe0ba",
+        "accent_a": "#fb923c",
+        "accent_b": "#ff6b2b",
+    },
+    "danger": {
+        "chip_bg": "rgba(248, 113, 113, 0.16)",
+        "chip_border": "rgba(248, 113, 113, 0.38)",
+        "chip_text": "#ffd0d0",
+        "accent_a": "#ef4444",
+        "accent_b": "#ff6b2b",
+    },
+}
+
+TEMPLATE_PRESENTATION: Dict[str, Dict[str, str]] = {
+    "invited": {
+        "tone": "brand",
+        "title": "You have been invited",
+        "subtitle": "A new account invitation is ready for you.",
+        "primary_label": "Accept invite",
+        "primary_url_key": "invite_link",
+        "secondary_label": "How it works",
+        "secondary_url_key": "how_it_works_url",
+    },
+    "welcome": {
+        "tone": "success",
+        "title": "Welcome to Magent",
+        "subtitle": "Your account is ready and synced.",
+        "primary_label": "Open Magent",
+        "primary_url_key": "app_url",
+        "secondary_label": "How it works",
+        "secondary_url_key": "how_it_works_url",
+    },
+    "warning": {
+        "tone": "warning",
+        "title": "Account warning",
+        "subtitle": "Please review the note below.",
+        "primary_label": "Open Magent",
+        "primary_url_key": "app_url",
+        "secondary_label": "How it works",
+        "secondary_url_key": "how_it_works_url",
+    },
+    "banned": {
+        "tone": "danger",
+        "title": "Account status changed",
+        "subtitle": "Your account has been restricted or removed.",
+        "primary_label": "How it works",
+        "primary_url_key": "how_it_works_url",
+        "secondary_label": "",
+        "secondary_url_key": "",
+    },
+}
+
+
+def _build_email_stat_card(label: str, value: str, detail: str = "") -> str:
+    detail_html = (
+        f"<div style=\"margin-top:8px; font-size:13px; line-height:1.6; color:#5c687d; word-break:break-word;\">"
+        f"{html.escape(detail)}</div>"
+        if detail
+        else ""
+    )
+    return (
+        "<table role=\"presentation\" width=\"100%\" cellspacing=\"0\" cellpadding=\"0\" "
+        "style=\"border-collapse:separate; background:#f8fafc; border:1px solid #d9e2ef; border-radius:16px;\">"
+        "<tr><td style=\"padding:16px; font-family:Segoe UI, Arial, sans-serif; color:#132033;\">"
+        f"<div style=\"font-size:11px; letter-spacing:0.12em; text-transform:uppercase; color:#6b778c; margin-bottom:8px;\">"
+        f"{html.escape(label)}</div>"
+        f"<div style=\"font-size:20px; font-weight:800; line-height:1.45; word-break:break-word; color:#132033;\">"
+        f"{html.escape(value)}</div>"
+        f"{detail_html}"
+        "</td></tr></table>"
+    )
+
+
+def _build_email_stat_grid(cards: list[str]) -> str:
+    if not cards:
+        return ""
+    rows: list[str] = []
+    for index in range(0, len(cards), 2):
+        left = cards[index]
+        right = cards[index + 1] if index + 1 < len(cards) else ""
+        rows.append(
+            "<tr>"
+            f"<td width=\"50%\" style=\"vertical-align:top; padding:0 5px 10px 0;\">{left}</td>"
+            f"<td width=\"50%\" style=\"vertical-align:top; padding:0 0 10px 5px;\">{right}</td>"
+            "</tr>"
+        )
+    return (
+        "<table role=\"presentation\" width=\"100%\" cellspacing=\"0\" cellpadding=\"0\" "
+        "style=\"border-collapse:collapse; margin:0 0 18px;\">"
+        f"{''.join(rows)}"
+        "</table>"
+    )
+
+
+def _build_email_list(items: list[str], *, ordered: bool = False) -> str:
+    tag = "ol" if ordered else "ul"
+    marker = "padding-left:20px;" if ordered else "padding-left:18px;"
+    rendered_items = "".join(
+        f"<li style=\"margin:0 0 8px;\">{html.escape(item)}</li>" for item in items if item
+    )
+    return (
+        f"<{tag} style=\"margin:0; {marker} color:#132033; line-height:1.8; font-size:14px;\">"
+        f"{rendered_items}"
+        f"</{tag}>"
+    )
+
+
+def _build_email_panel(title: str, body_html: str, *, variant: str = "neutral") -> str:
+    styles = {
+        "neutral": {
+            "background": "#f8fafc",
+            "border": "#d9e2ef",
+            "eyebrow": "#6b778c",
+            "text": "#132033",
+        },
+        "brand": {
+            "background": "#eef4ff",
+            "border": "#bfd2ff",
+            "eyebrow": "#2754b6",
+            "text": "#132033",
+        },
+        "success": {
+            "background": "#edf9f0",
+            "border": "#bfe4c6",
+            "eyebrow": "#1f7a3f",
+            "text": "#132033",
+        },
+        "warning": {
+            "background": "#fff5ea",
+            "border": "#ffd5a8",
+            "eyebrow": "#c46a10",
+            "text": "#132033",
+        },
+        "danger": {
+            "background": "#fff0f0",
+            "border": "#f3c1c1",
+            "eyebrow": "#bb2d2d",
+            "text": "#132033",
+        },
+    }.get(variant, {
+        "background": "#f8fafc",
+        "border": "#d9e2ef",
+        "eyebrow": "#6b778c",
+        "text": "#132033",
+    })
+    return (
+        "<table role=\"presentation\" width=\"100%\" cellspacing=\"0\" cellpadding=\"0\" "
+        f"style=\"border-collapse:separate; margin:0 0 18px; background:{styles['background']}; "
+        f"border:1px solid {styles['border']}; border-radius:18px;\">"
+        f"<tr><td style=\"padding:18px; font-family:Segoe UI, Arial, sans-serif; color:{styles['text']};\">"
+        f"<div style=\"font-size:11px; letter-spacing:0.12em; text-transform:uppercase; color:{styles['eyebrow']}; margin-bottom:10px;\">"
+        f"{html.escape(title)}</div>"
+        f"<div style=\"font-size:14px; line-height:1.8; color:{styles['text']};\">{body_html}</div>"
+        "</td></tr></table>"
+    )
+
+
 DEFAULT_TEMPLATES: Dict[str, Dict[str, str]] = {
     "invited": {
         "subject": "{{app_name}} invite for {{recipient_email}}",
@@ -77,18 +262,43 @@ DEFAULT_TEMPLATES: Dict[str, Dict[str, str]] = {
             "Build: {{build_number}}\n"
         ),
         "body_html": (
-            "<h1>You have been invited</h1>"
+            "<div style=\"margin:0 0 20px; color:#132033; font-size:15px; line-height:1.7;\">"
-            "<p>You have been invited to <strong>{{app_name}}</strong>.</p>"
+            "A new invitation has been prepared for <strong>{{recipient_email}}</strong>. Use the details below to sign up."
-            "<p><strong>Invite code:</strong> {{invite_code}}<br />"
+            "</div>"
-            "<strong>Invited by:</strong> {{inviter_username}}<br />"
+            + _build_email_stat_grid(
-            "<strong>Invite label:</strong> {{invite_label}}<br />"
+                [
-            "<strong>Expires:</strong> {{invite_expires_at}}<br />"
+                    _build_email_stat_card("Invite code", "{{invite_code}}"),
-            "<strong>Remaining uses:</strong> {{invite_remaining_uses}}</p>"
+                    _build_email_stat_card("Invited by", "{{inviter_username}}"),
-            "<p>{{invite_description}}</p>"
+                    _build_email_stat_card("Invite label", "{{invite_label}}"),
-            "<p>{{message}}</p>"
+                    _build_email_stat_card(
-            "<p><a href=\"{{invite_link}}\">Accept invite and create account</a></p>"
+                        "Access window",
-            "<p><a href=\"{{how_it_works_url}}\">How it works</a></p>"
+                        "{{invite_expires_at}}",
-            "<p class=\"meta\">Build {{build_number}}</p>"
+                        "Remaining uses: {{invite_remaining_uses}}",
+                    ),
+                ]
+            )
+            + _build_email_panel(
+                "Invitation details",
+                "<div style=\"white-space:pre-line;\">{{invite_description}}</div>",
+                variant="brand",
+            )
+            + _build_email_panel(
+                "Message from admin",
+                "<div style=\"white-space:pre-line;\">{{message}}</div>",
+                variant="neutral",
+            )
+            + _build_email_panel(
+                "What happens next",
+                _build_email_list(
+                    [
+                        "Open the invite link and complete the signup flow.",
+                        "Sign in using the shared credentials for Magent and Seerr.",
+                        "Use the How it works page if you want a quick overview first.",
+                    ],
+                    ordered=True,
+                ),
+                variant="neutral",
+            )
         ),
     },
     "welcome": {
@@ -102,12 +312,34 @@ DEFAULT_TEMPLATES: Dict[str, Dict[str, str]] = {
             "{{message}}\n"
         ),
         "body_html": (
-            "<h1>Welcome</h1>"
+            "<div style=\"margin:0 0 18px; color:#132033; font-size:15px; line-height:1.7;\">"
-            "<p>Your {{app_name}} account is ready, <strong>{{username}}</strong>.</p>"
+            "Your account is live and ready to use. Everything below mirrors the current site behavior."
-            "<p><strong>Role:</strong> {{role}}</p>"
+            "</div>"
-            "<p><a href=\"{{app_url}}\">Open {{app_name}}</a><br />"
+            + _build_email_stat_grid(
-            "<a href=\"{{how_it_works_url}}\">Read how it works</a></p>"
+                [
-            "<p>{{message}}</p>"
+                    _build_email_stat_card("Username", "{{username}}"),
+                    _build_email_stat_card("Role", "{{role}}"),
+                    _build_email_stat_card("Magent", "{{app_url}}"),
+                    _build_email_stat_card("Guides", "{{how_it_works_url}}"),
+                ]
+            )
+            + _build_email_panel(
+                "What to do next",
+                _build_email_list(
+                    [
+                        "Open Magent and sign in using your shared credentials.",
+                        "Search all requests or review your own activity without refreshing the page.",
+                        "Use the invite tools in your profile if your account allows it.",
+                    ],
+                    ordered=True,
+                ),
+                variant="success",
+            )
+            + _build_email_panel(
+                "Additional notes",
+                "<div style=\"white-space:pre-line;\">{{message}}</div>",
+                variant="neutral",
+            )
         ),
     },
     "warning": {
@@ -120,12 +352,38 @@ DEFAULT_TEMPLATES: Dict[str, Dict[str, str]] = {
             "If you need help, contact the admin.\n"
         ),
         "body_html": (
-            "<h1>Account warning</h1>"
+            "<div style=\"margin:0 0 18px; color:#132033; font-size:15px; line-height:1.7;\">"
-            "<p>Hello <strong>{{username}}</strong>,</p>"
+            "Please review this account notice carefully. This message was sent by an administrator."
-            "<p>This is a warning regarding your {{app_name}} account.</p>"
+            "</div>"
-            "<p><strong>Reason:</strong> {{reason}}</p>"
+            + _build_email_stat_grid(
-            "<p>{{message}}</p>"
+                [
-            "<p>If you need help, contact the admin.</p>"
+                    _build_email_stat_card("Account", "{{username}}"),
+                    _build_email_stat_card("Role", "{{role}}"),
+                    _build_email_stat_card("Application", "{{app_name}}"),
+                    _build_email_stat_card("Support", "{{how_it_works_url}}"),
+                ]
+            )
+            + _build_email_panel(
+                "Reason",
+                "<div style=\"font-size:18px; font-weight:800; line-height:1.6; white-space:pre-line;\">{{reason}}</div>",
+                variant="warning",
+            )
+            + _build_email_panel(
+                "Administrator note",
+                "<div style=\"white-space:pre-line;\">{{message}}</div>",
+                variant="neutral",
+            )
+            + _build_email_panel(
+                "What to do next",
+                _build_email_list(
+                    [
+                        "Review the note above and confirm you understand what needs to change.",
+                        "If you need help, reply through your usual support path or contact an administrator.",
+                        "Keep this email for reference until the matter is resolved.",
+                    ]
+                ),
+                variant="neutral",
+            )
         ),
     },
     "banned": {
@@ -137,11 +395,38 @@ DEFAULT_TEMPLATES: Dict[str, Dict[str, str]] = {
             "{{message}}\n"
         ),
         "body_html": (
-            "<h1>Account status changed</h1>"
+            "<div style=\"margin:0 0 18px; color:#132033; font-size:15px; line-height:1.7;\">"
-            "<p>Hello <strong>{{username}}</strong>,</p>"
+            "Your account access has changed. Review the details below."
-            "<p>Your {{app_name}} account has been banned or removed.</p>"
+            "</div>"
-            "<p><strong>Reason:</strong> {{reason}}</p>"
+            + _build_email_stat_grid(
-            "<p>{{message}}</p>"
+                [
+                    _build_email_stat_card("Account", "{{username}}"),
+                    _build_email_stat_card("Status", "Restricted"),
+                    _build_email_stat_card("Application", "{{app_name}}"),
+                    _build_email_stat_card("Guidance", "{{how_it_works_url}}"),
+                ]
+            )
+            + _build_email_panel(
+                "Reason",
+                "<div style=\"font-size:18px; font-weight:800; line-height:1.6; white-space:pre-line;\">{{reason}}</div>",
+                variant="danger",
+            )
+            + _build_email_panel(
+                "Administrator note",
+                "<div style=\"white-space:pre-line;\">{{message}}</div>",
+                variant="neutral",
+            )
+            + _build_email_panel(
+                "What this means",
+                _build_email_list(
+                    [
+                        "Your access has been removed or restricted across the linked services.",
+                        "If you believe this is incorrect, contact the site administrator directly.",
+                        "Do not rely on old links or cached sessions after this change.",
+                    ]
+                ),
+                variant="neutral",
+            )
         ),
     },
 }
@@ -166,6 +451,10 @@ def _normalize_email(value: object) -> Optional[str]:
     return str(value).strip()
 
 
+def normalize_delivery_email(value: object) -> Optional[str]:
+    return _normalize_email(value)
+
+
 def _normalize_display_text(value: object, fallback: str = "") -> str:
     if value is None:
         return fallback
@@ -223,6 +512,218 @@ def _build_default_base_url() -> str:
     return f"http://localhost:{port}"
 
 
+def _looks_like_full_html_document(value: str) -> bool:
+    probe = value.lstrip().lower()
+    return probe.startswith("<!doctype") or probe.startswith("<html") or "<body" in probe[:300]
+
+
+def _build_email_action_button(label: str, url: str, *, primary: bool) -> str:
+    background = "linear-gradient(135deg, #ff6b2b 0%, #1c6bff 100%)" if primary else "#ffffff"
+    fallback = "#1c6bff" if primary else "#ffffff"
+    border = "1px solid rgba(28, 107, 255, 0.28)" if primary else "1px solid #d5deed"
+    color = "#ffffff" if primary else "#132033"
+    return (
+        f"<a href=\"{html.escape(url)}\" "
+        f"style=\"display:inline-block; padding:12px 20px; margin:0 12px 12px 0; border-radius:999px; "
+        f"background-color:{fallback}; background:{background}; border:{border}; color:{color}; text-decoration:none; font-size:14px; "
+        f"font-weight:800; letter-spacing:0.01em;\">{html.escape(label)}</a>"
+    )
+
+
+@lru_cache(maxsize=1)
+def _get_email_logo_bytes() -> bytes:
+    logo_path = Path(__file__).resolve().parents[1] / "assets" / "branding" / "logo.png"
+    try:
+        return logo_path.read_bytes()
+    except OSError:
+        return b""
+
+
+def _build_email_logo_block(app_name: str) -> str:
+    if _get_email_logo_bytes():
+        return (
+            f"<img src=\"cid:{EMAIL_LOGO_CID}\" alt=\"{html.escape(app_name)}\" width=\"52\" height=\"52\" "
+            "style=\"display:block; width:52px; height:52px; border-radius:14px; border:1px solid rgba(255,255,255,0.08); "
+            "background:#0f1522; padding:6px;\" />"
+        )
+    return (
+        "<div style=\"width:52px; height:52px; border-radius:14px; border:1px solid rgba(255,255,255,0.08); "
+        "background:linear-gradient(135deg, #ff6b2b 0%, #1c6bff 100%); color:#ffffff; font-size:24px; "
+        "font-weight:900; text-align:center; line-height:52px;\">M</div>"
+    )
+
+
+def _build_outlook_safe_test_email_html(
+    *,
+    app_name: str,
+    application_url: str,
+    build_number: str,
+    smtp_target: str,
+    security_mode: str,
+    auth_mode: str,
+    warning: str,
+    primary_url: str = "",
+) -> str:
+    action_html = (
+        _build_email_action_button("Open Magent", primary_url, primary=True) if primary_url else ""
+    )
+    logo_block = _build_email_logo_block(app_name)
+    warning_block = (
+        "<tr>"
+        "<td style=\"padding:0 32px 24px 32px; font-family:Segoe UI, Arial, sans-serif;\">"
+        "<table role=\"presentation\" width=\"100%\" cellspacing=\"0\" cellpadding=\"0\" "
+        "style=\"border-collapse:separate; background:#fff5ea; border:1px solid #ffd5a8; border-radius:14px;\">"
+        "<tr><td style=\"padding:16px; color:#132033; font-size:14px; line-height:1.7;\">"
+        "<div style=\"font-size:11px; letter-spacing:0.12em; text-transform:uppercase; color:#c46a10; margin-bottom:8px;\">"
+        "Delivery notes</div>"
+        f"{html.escape(warning)}"
+        "</td></tr></table>"
+        "</td>"
+        "</tr>"
+    ) if warning else ""
+    return (
+        "<!doctype html>"
+        "<html>"
+        "<body style=\"margin:0; padding:0; background:#eef2f7;\" bgcolor=\"#eef2f7\">"
+        "<table role=\"presentation\" width=\"100%\" cellspacing=\"0\" cellpadding=\"0\" "
+        "style=\"border-collapse:collapse; background:#eef2f7;\" bgcolor=\"#eef2f7\">"
+        "<tr><td align=\"center\" style=\"padding:32px 16px;\">"
+        "<table role=\"presentation\" width=\"680\" cellspacing=\"0\" cellpadding=\"0\" "
+        "style=\"width:680px; max-width:680px; border-collapse:collapse; background:#ffffff; border:1px solid #d5deed;\">"
+        "<tr><td style=\"padding:24px 32px; background:#0f172a;\" bgcolor=\"#0f172a\">"
+        "<table role=\"presentation\" width=\"100%\" cellspacing=\"0\" cellpadding=\"0\" style=\"border-collapse:collapse;\">"
+        "<tr>"
+        f"<td width=\"56\" valign=\"middle\">{logo_block}</td>"
+        "<td valign=\"middle\" style=\"padding-left:16px; font-family:Segoe UI, Arial, sans-serif; color:#ffffff;\">"
+        f"<div style=\"font-size:28px; line-height:1.1; font-weight:800; color:#ffffff;\">{html.escape(app_name)} email test</div>"
+        "<div style=\"margin-top:6px; font-size:15px; line-height:1.5; color:#d5deed;\">This confirms Magent can generate and hand off branded mail.</div>"
+        "</td>"
+        "</tr>"
+        "</table>"
+        "</td></tr>"
+        "<tr><td height=\"6\" style=\"background:#ff6b2b; font-size:0; line-height:0;\">&nbsp;</td></tr>"
+        "<tr><td style=\"padding:28px 32px 18px 32px; font-family:Segoe UI, Arial, sans-serif; color:#132033;\">"
+        "<div style=\"font-size:18px; line-height:1.6; color:#132033;\">This is a test email from <strong>Magent</strong>.</div>"
+        "</td></tr>"
+        "<tr>"
+        "<td style=\"padding:0 32px 18px 32px; font-family:Segoe UI, Arial, sans-serif;\">"
+        "<table role=\"presentation\" width=\"100%\" cellspacing=\"0\" cellpadding=\"0\" style=\"border-collapse:collapse;\">"
+        "<tr>"
+        "<td width=\"50%\" valign=\"top\" style=\"padding:0 8px 12px 0;\">"
+        f"{_build_email_stat_card('Build', build_number)}"
+        "</td>"
+        "<td width=\"50%\" valign=\"top\" style=\"padding:0 0 12px 8px;\">"
+        f"{_build_email_stat_card('Application URL', application_url)}"
+        "</td>"
+        "</tr>"
+        "<tr>"
+        "<td width=\"50%\" valign=\"top\" style=\"padding:0 8px 12px 0;\">"
+        f"{_build_email_stat_card('SMTP target', smtp_target)}"
+        "</td>"
+        "<td width=\"50%\" valign=\"top\" style=\"padding:0 0 12px 8px;\">"
+        f"{_build_email_stat_card('Security', security_mode, auth_mode)}"
+        "</td>"
+        "</tr>"
+        "</table>"
+        "</td>"
+        "</tr>"
+        "<tr>"
+        "<td style=\"padding:0 32px 24px 32px; font-family:Segoe UI, Arial, sans-serif;\">"
+        "<table role=\"presentation\" width=\"100%\" cellspacing=\"0\" cellpadding=\"0\" "
+        "style=\"border-collapse:separate; background:#eef4ff; border:1px solid #bfd2ff; border-radius:14px;\">"
+        "<tr><td style=\"padding:16px; color:#132033; font-size:14px; line-height:1.8;\">"
+        "<div style=\"font-size:11px; letter-spacing:0.12em; text-transform:uppercase; color:#2754b6; margin-bottom:8px;\">"
+        "What this verifies</div>"
+        "<div>Magent can build the HTML template shell correctly.</div>"
+        "<div>The configured SMTP route accepts and relays the message.</div>"
+        "<div>Branding, links, and build metadata are rendering consistently.</div>"
+        "</td></tr></table>"
+        "</td>"
+        "</tr>"
+        f"{warning_block}"
+        "<tr>"
+        "<td style=\"padding:0 32px 32px 32px; font-family:Segoe UI, Arial, sans-serif;\">"
+        f"{action_html}"
+        "</td>"
+        "</tr>"
+        "</table>"
+        "</td></tr></table>"
+        "</body>"
+        "</html>"
+    )
+
+
+def _wrap_email_html(
+    *,
+    app_name: str,
+    app_url: str,
+    build_number: str,
+    title: str,
+    subtitle: str,
+    tone: str,
+    body_html: str,
+    primary_label: str = "",
+    primary_url: str = "",
+    secondary_label: str = "",
+    secondary_url: str = "",
+    footer_note: str = "",
+) -> str:
+    styles = EMAIL_TONE_STYLES.get(tone, EMAIL_TONE_STYLES["brand"])
+    actions = []
+    if primary_label and primary_url:
+        actions.append(_build_email_action_button(primary_label, primary_url, primary=True))
+    if secondary_label and secondary_url:
+        actions.append(_build_email_action_button(secondary_label, secondary_url, primary=False))
+    actions_html = "".join(actions)
+
+    footer = footer_note or "This email was generated automatically by Magent."
+    logo_block = _build_email_logo_block(app_name)
+
+    return (
+        "<!doctype html>"
+        "<html><body style=\"margin:0; padding:0; background:#eef2f7;\" bgcolor=\"#eef2f7\">"
+        "<div style=\"display:none; max-height:0; overflow:hidden; opacity:0;\">"
+        f"{html.escape(title)} - {html.escape(subtitle)}"
+        "</div>"
+        "<table role=\"presentation\" width=\"100%\" cellspacing=\"0\" cellpadding=\"0\" "
+        "style=\"width:100%; border-collapse:collapse; background:#eef2f7;\" bgcolor=\"#eef2f7\">"
+        "<tr><td style=\"padding:32px 18px;\" bgcolor=\"#eef2f7\">"
+        "<table role=\"presentation\" width=\"100%\" cellspacing=\"0\" cellpadding=\"0\" "
+        "style=\"max-width:680px; margin:0 auto; border-collapse:collapse;\">"
+        "<tr><td style=\"padding:0 0 18px;\">"
+        f"<div style=\"padding:24px 28px; background:#ffffff; border:1px solid #d5deed; border-radius:28px; box-shadow:0 18px 48px rgba(15,23,42,0.08);\">"
+        "<table role=\"presentation\" width=\"100%\" cellspacing=\"0\" cellpadding=\"0\" style=\"border-collapse:collapse;\">"
+        "<tr>"
+        f"<td style=\"vertical-align:middle; width:64px; padding:0 18px 0 0;\">{logo_block}</td>"
+        "<td style=\"vertical-align:middle;\">"
+        f"<div style=\"font-size:11px; letter-spacing:0.18em; text-transform:uppercase; color:#6b778c; margin-bottom:6px;\">{html.escape(app_name)}</div>"
+        f"<div style=\"font-size:30px; line-height:1.1; font-weight:900; color:#132033; margin:0 0 6px;\">{html.escape(title)}</div>"
+        f"<div style=\"font-size:15px; line-height:1.6; color:#5c687d;\">{html.escape(subtitle or EMAIL_TAGLINE)}</div>"
+        "</td>"
+        "</tr>"
+        "</table>"
+        f"<div style=\"height:6px; margin:22px 0 22px; border-radius:999px; background-color:{styles['accent_b']}; background:linear-gradient(90deg, {styles['accent_a']} 0%, {styles['accent_b']} 100%);\"></div>"
+        f"<div style=\"display:inline-block; padding:7px 12px; margin:0 0 16px; background:{styles['chip_bg']}; "
+        f"border:1px solid {styles['chip_border']}; border-radius:999px; color:{styles['chip_text']}; "
+        "font-size:11px; font-weight:800; letter-spacing:0.14em; text-transform:uppercase;\">"
+        f"{html.escape(EMAIL_TAGLINE)}</div>"
+        f"<div style=\"color:#132033;\">{body_html}</div>"
+        f"<div style=\"margin:24px 0 0;\">{actions_html}</div>"
+        "<div style=\"margin:28px 0 0; padding:18px 0 0; border-top:1px solid #e2e8f0;\">"
+        "<table role=\"presentation\" width=\"100%\" cellspacing=\"0\" cellpadding=\"0\" style=\"border-collapse:collapse;\">"
+        "<tr>"
+        f"<td style=\"font-size:12px; line-height:1.7; color:#6b778c;\">{html.escape(footer)}</td>"
+        f"<td style=\"font-size:12px; line-height:1.7; color:#6b778c; text-align:right;\">Build {html.escape(build_number)}</td>"
+        "</tr>"
+        "</table>"
+        "</div>"
+        "</div>"
+        "</td></tr></table>"
+        "</td></tr></table>"
+        "</body></html>"
+    )
+
+
 def build_invite_email_context(
     *,
     invite: Optional[Dict[str, Any]] = None,
@@ -259,7 +760,7 @@ def build_invite_email_context(
             invite.get("created_by") if invite else (user.get("username") if user else None),
             "Admin",
         ),
-        "message": _normalize_display_text(message, ""),
+        "message": _normalize_display_text(message, "No additional note."),
         "reason": _normalize_display_text(reason, "Not specified"),
         "recipient_email": _normalize_display_text(resolved_recipient, "No email supplied"),
         "role": _normalize_display_text(user.get("role") if user else None, "user"),
@@ -344,11 +845,35 @@ def render_invite_email_template(
         reason=reason,
         overrides=overrides,
     )
-    body_html = _render_template_string(template["body_html"], context, escape_html=True)
+    raw_body_html = _render_template_string(template["body_html"], context, escape_html=True)
     body_text = _render_template_string(template["body_text"], context, escape_html=False)
-    if not body_text.strip() and body_html.strip():
+    if not body_text.strip() and raw_body_html.strip():
-        body_text = _strip_html_for_text(body_html)
+        body_text = _strip_html_for_text(raw_body_html)
     subject = _render_template_string(template["subject"], context, escape_html=False)
+    presentation = TEMPLATE_PRESENTATION.get(template_key, TEMPLATE_PRESENTATION["invited"])
+    primary_url = _normalize_display_text(context.get(presentation["primary_url_key"], ""))
+    secondary_url = _normalize_display_text(context.get(presentation["secondary_url_key"], ""))
+    if _looks_like_full_html_document(raw_body_html):
+        body_html = raw_body_html.strip()
+    else:
+        body_html = _wrap_email_html(
+            app_name=_normalize_display_text(context.get("app_name"), env_settings.app_name),
+            app_url=_normalize_display_text(context.get("app_url"), _build_default_base_url()),
+            build_number=_normalize_display_text(context.get("build_number"), BUILD_NUMBER),
+            title=_normalize_display_text(context.get("title"), presentation["title"]),
+            subtitle=_normalize_display_text(context.get("subtitle"), presentation["subtitle"]),
+            tone=_normalize_display_text(context.get("tone"), presentation["tone"]),
+            body_html=raw_body_html.strip(),
+            primary_label=_normalize_display_text(
+                context.get("primary_label"), presentation["primary_label"]
+            ),
+            primary_url=primary_url,
+            secondary_label=_normalize_display_text(
+                context.get("secondary_label"), presentation["secondary_label"]
+            ),
+            secondary_url=secondary_url,
+            footer_note=_normalize_display_text(context.get("footer_note"), ""),
+        ).strip()
     return {
         "subject": subject.strip(),
         "body_text": body_text.strip(),
@@ -359,6 +884,9 @@ def render_invite_email_template(
 def resolve_user_delivery_email(user: Optional[Dict[str, Any]], invite: Optional[Dict[str, Any]] = None) -> Optional[str]:
     if not isinstance(user, dict):
         return _normalize_email(invite.get("recipient_email") if isinstance(invite, dict) else None)
+    stored_email = _normalize_email(user.get("email"))
+    if stored_email:
+        return stored_email
     username_email = _normalize_email(user.get("username"))
     if username_email:
         return username_email
@@ -396,7 +924,56 @@ def smtp_email_delivery_warning() -> Optional[str]:
     return None
 
 
-def _send_email_sync(*, recipient_email: str, subject: str, body_text: str, body_html: str) -> None:
+def _flatten_message(message: EmailMessage) -> bytes:
+    buffer = BytesIO()
+    BytesGenerator(buffer, policy=SMTP_POLICY).flatten(message)
+    return buffer.getvalue()
+
+
+def _decode_smtp_message(value: bytes | str | None) -> str:
+    if value is None:
+        return ""
+    if isinstance(value, bytes):
+        return value.decode("utf-8", errors="replace")
+    return str(value)
+
+
+def _parse_exchange_receipt(value: bytes | str | None) -> Dict[str, str]:
+    message = _decode_smtp_message(value)
+    receipt: Dict[str, str] = {"raw": message}
+    message_id_match = EXCHANGE_MESSAGE_ID_PATTERN.search(message)
+    internal_id_match = EXCHANGE_INTERNAL_ID_PATTERN.search(message)
+    if message_id_match:
+        receipt["provider_message_id"] = message_id_match.group(1)
+    if internal_id_match:
+        receipt["provider_internal_id"] = internal_id_match.group(1)
+    return receipt
+
+
+def _send_via_smtp_session(
+    smtp: smtplib.SMTP,
+    *,
+    from_address: str,
+    recipient_email: str,
+    message: EmailMessage,
+) -> Dict[str, str]:
+    mail_code, mail_message = smtp.mail(from_address)
+    if mail_code >= 400:
+        raise smtplib.SMTPResponseException(mail_code, mail_message)
+    rcpt_code, rcpt_message = smtp.rcpt(recipient_email)
+    if rcpt_code >= 400:
+        raise smtplib.SMTPRecipientsRefused({recipient_email: (rcpt_code, rcpt_message)})
+    data_code, data_message = smtp.data(_flatten_message(message))
+    if data_code >= 400:
+        raise smtplib.SMTPDataError(data_code, data_message)
+    receipt = _parse_exchange_receipt(data_message)
+    receipt["mail_response"] = _decode_smtp_message(mail_message)
+    receipt["rcpt_response"] = _decode_smtp_message(rcpt_message)
+    receipt["data_response"] = _decode_smtp_message(data_message)
+    return receipt
+
+
+def _send_email_sync(*, recipient_email: str, subject: str, body_text: str, body_html: str) -> Dict[str, str]:
     runtime = get_runtime_settings()
     host = _normalize_display_text(runtime.magent_notify_email_smtp_host)
     port = int(runtime.magent_notify_email_smtp_port or 587)
@@ -427,9 +1004,27 @@ def _send_email_sync(*, recipient_email: str, subject: str, body_text: str, body
     message["Subject"] = subject
     message["From"] = formataddr((from_name, from_address))
     message["To"] = recipient_email
+    message["Date"] = formatdate(localtime=True)
+    if "@" in from_address:
+        message["Message-ID"] = make_msgid(domain=from_address.split("@", 1)[1])
+    else:
+        message["Message-ID"] = make_msgid()
     message.set_content(body_text or _strip_html_for_text(body_html))
     if body_html.strip():
         message.add_alternative(body_html, subtype="html")
+        if f"cid:{EMAIL_LOGO_CID}" in body_html:
+            logo_bytes = _get_email_logo_bytes()
+            if logo_bytes:
+                html_part = message.get_body(preferencelist=("html",))
+                if html_part is not None:
+                    html_part.add_related(
+                        logo_bytes,
+                        maintype="image",
+                        subtype="png",
+                        cid=f"<{EMAIL_LOGO_CID}>",
+                        filename="logo.png",
+                        disposition="inline",
+                    )
 
     if use_ssl:
         with smtplib.SMTP_SSL(host, port, timeout=20) as smtp:
@@ -437,9 +1032,20 @@ def _send_email_sync(*, recipient_email: str, subject: str, body_text: str, body
             if username and password:
                 smtp.login(username, password)
                 logger.debug("smtp login succeeded host=%s username=%s", host, username)
-            smtp.send_message(message)
+            receipt = _send_via_smtp_session(
-            logger.info("smtp send accepted recipient=%s host=%s mode=ssl", recipient_email, host)
+                smtp,
-        return
+                from_address=from_address,
+                recipient_email=recipient_email,
+                message=message,
+            )
+            logger.info(
+                "smtp send accepted recipient=%s host=%s mode=ssl provider_message_id=%s provider_internal_id=%s",
+                recipient_email,
+                host,
+                receipt.get("provider_message_id"),
+                receipt.get("provider_internal_id"),
+            )
+        return receipt
 
     with smtplib.SMTP(host, port, timeout=20) as smtp:
         logger.debug("smtp connection opened host=%s port=%s", host, port)
@@ -451,8 +1057,20 @@ def _send_email_sync(*, recipient_email: str, subject: str, body_text: str, body
         if username and password:
             smtp.login(username, password)
             logger.debug("smtp login succeeded host=%s username=%s", host, username)
-        smtp.send_message(message)
+        receipt = _send_via_smtp_session(
-        logger.info("smtp send accepted recipient=%s host=%s mode=plain", recipient_email, host)
+            smtp,
+            from_address=from_address,
+            recipient_email=recipient_email,
+            message=message,
+        )
+        logger.info(
+            "smtp send accepted recipient=%s host=%s mode=plain provider_message_id=%s provider_internal_id=%s",
+            recipient_email,
+            host,
+            receipt.get("provider_message_id"),
+            receipt.get("provider_internal_id"),
+        )
+        return receipt
 
 
 async def send_templated_email(
@@ -484,7 +1102,7 @@ async def send_templated_email(
         reason=reason,
         overrides=overrides,
     )
-    await asyncio.to_thread(
+    receipt = await asyncio.to_thread(
         _send_email_sync,
         recipient_email=resolved_email,
         subject=rendered["subject"],
@@ -495,6 +1113,11 @@ async def send_templated_email(
     return {
         "recipient_email": resolved_email,
         "subject": rendered["subject"],
+        **{
+            key: value
+            for key, value in receipt.items()
+            if key in {"provider_message_id", "provider_internal_id", "data_response"}
+        },
     }
 
 
@@ -511,20 +1134,74 @@ async def send_test_email(recipient_email: Optional[str] = None) -> Dict[str, st
         raise RuntimeError("No valid recipient email is configured for the test message.")
 
     application_url = _normalize_display_text(runtime.magent_application_url, "Not configured")
+    primary_url = application_url if application_url.lower().startswith(("http://", "https://")) else ""
+    smtp_target = f"{_normalize_display_text(runtime.magent_notify_email_smtp_host, 'Not configured')}:{int(runtime.magent_notify_email_smtp_port or 587)}"
+    security_mode = "SSL" if runtime.magent_notify_email_use_ssl else ("STARTTLS" if runtime.magent_notify_email_use_tls else "Plain SMTP")
+    auth_mode = "Authenticated" if (
+        _normalize_display_text(runtime.magent_notify_email_smtp_username)
+        and _normalize_display_text(runtime.magent_notify_email_smtp_password)
+    ) else "No SMTP auth"
+    delivery_warning = smtp_email_delivery_warning()
     subject = f"{env_settings.app_name} email test"
     body_text = (
         f"This is a test email from {env_settings.app_name}.\n\n"
         f"Build: {BUILD_NUMBER}\n"
         f"Application URL: {application_url}\n"
+        f"SMTP target: {smtp_target}\n"
+        f"Security: {security_mode} ({auth_mode})\n\n"
+        "What this verifies:\n"
+        "- Magent can build the HTML template shell correctly.\n"
+        "- The configured SMTP route accepts and relays the message.\n"
+        "- Branding, links, and build metadata are rendering consistently.\n"
     )
-    body_html = (
+    body_html = _wrap_email_html(
-        f"<h1>{html.escape(env_settings.app_name)} email test</h1>"
+        app_name=env_settings.app_name,
-        f"<p>This is a test email from <strong>{html.escape(env_settings.app_name)}</strong>.</p>"
+        app_url=_build_default_base_url(),
-        f"<p><strong>Build:</strong> {html.escape(BUILD_NUMBER)}<br />"
+        build_number=BUILD_NUMBER,
-        f"<strong>Application URL:</strong> {html.escape(application_url)}</p>"
+        title="Email delivery test",
+        subtitle="This confirms Magent can generate and hand off branded mail.",
+        tone="brand",
+        body_html=(
+            "<div style=\"margin:0 0 18px; color:#132033; font-size:15px; line-height:1.7;\">"
+            "This is a live test email from Magent. If this renders correctly, the HTML template shell and SMTP handoff are both working."
+            "</div>"
+            + _build_email_stat_grid(
+                [
+                    _build_email_stat_card("Recipient", resolved_email),
+                    _build_email_stat_card("Build", BUILD_NUMBER),
+                    _build_email_stat_card("SMTP target", smtp_target),
+                    _build_email_stat_card("Security", security_mode, auth_mode),
+                    _build_email_stat_card("Application URL", application_url),
+                    _build_email_stat_card("Template shell", "Branded HTML", "Logo, gradient, action buttons"),
+                ]
+            )
+            + _build_email_panel(
+                "What this verifies",
+                _build_email_list(
+                    [
+                        "Magent can build the HTML template shell correctly.",
+                        "The configured SMTP route accepts and relays the message.",
+                        "Branding, links, and build metadata are rendering consistently.",
+                    ]
+                ),
+                variant="brand",
+            )
+            + _build_email_panel(
+                "Delivery notes",
+                (
+                    f"<div style=\"white-space:pre-line;\">{html.escape(delivery_warning)}</div>"
+                    if delivery_warning
+                    else "Use this test when changing SMTP settings, relay targets, or branding."
+                ),
+                variant="warning" if delivery_warning else "neutral",
+            )
+        ),
+        primary_label="Open Magent" if primary_url else "",
+        primary_url=primary_url,
+        footer_note="SMTP test email generated by Magent.",
     )
 
-    await asyncio.to_thread(
+    receipt = await asyncio.to_thread(
         _send_email_sync,
         recipient_email=resolved_email,
         subject=subject,
@@ -533,6 +1210,13 @@ async def send_test_email(recipient_email: Optional[str] = None) -> Dict[str, st
     )
     logger.info("SMTP test email sent: recipient=%s", resolved_email)
     result = {"recipient_email": resolved_email, "subject": subject}
+    result.update(
+        {
+            key: value
+            for key, value in receipt.items()
+            if key in {"provider_message_id", "provider_internal_id", "data_response"}
+        }
+    )
     warning = smtp_email_delivery_warning()
     if warning:
         result["warning"] = warning
@@ -566,16 +1250,56 @@ async def send_password_reset_email(
         f"Expires: {expires_at}\n\n"
         "If you did not request this reset, you can ignore this email.\n"
     )
-    body_html = (
+    body_html = _wrap_email_html(
-        f"<h1>{html.escape(env_settings.app_name)} password reset</h1>"
+        app_name=env_settings.app_name,
-        f"<p>A password reset was requested for <strong>{html.escape(username)}</strong>.</p>"
+        app_url=app_url,
-        f"<p>This link will reset the password used for <strong>{html.escape(provider_label)}</strong>.</p>"
+        build_number=BUILD_NUMBER,
-        f"<p><a href=\"{html.escape(reset_url)}\">Reset password</a></p>"
+        title="Reset your password",
-        f"<p><strong>Expires:</strong> {html.escape(expires_at)}</p>"
+        subtitle=f"This will update the credentials used for {provider_label}.",
-        "<p>If you did not request this reset, you can ignore this email.</p>"
+        tone="brand",
+        body_html=(
+            f"<div style=\"margin:0 0 18px; color:#132033; font-size:15px; line-height:1.7;\">"
+            f"A password reset was requested for <strong>{html.escape(username)}</strong>."
+            "</div>"
+            + _build_email_stat_grid(
+                [
+                    _build_email_stat_card("Account", username),
+                    _build_email_stat_card("Expires", expires_at),
+                    _build_email_stat_card("Credentials updated", provider_label),
+                    _build_email_stat_card("Delivery target", resolved_email),
+                ]
+            )
+            + _build_email_panel(
+                "What will be updated",
+                f"This reset will update the password used for <strong>{html.escape(provider_label)}</strong>.",
+                variant="brand",
+            )
+            + _build_email_panel(
+                "What happens next",
+                _build_email_list(
+                    [
+                        "Open the reset link and choose a new password.",
+                        "Complete the form before the expiry time shown above.",
+                        "Use the new password the next time you sign in.",
+                    ],
+                    ordered=True,
+                ),
+                variant="neutral",
+            )
+            + _build_email_panel(
+                "Safety note",
+                "If you did not request this reset, ignore this email. No changes will be applied until the reset link is opened and completed.",
+                variant="warning",
+            )
+        ),
+        primary_label="Reset password",
+        primary_url=reset_url,
+        secondary_label="Open Magent",
+        secondary_url=app_url,
+        footer_note="Password reset email generated by Magent.",
     )
 
-    await asyncio.to_thread(
+    receipt = await asyncio.to_thread(
         _send_email_sync,
         recipient_email=resolved_email,
         subject=subject,
@@ -592,6 +1316,11 @@ async def send_password_reset_email(
         "recipient_email": resolved_email,
         "subject": subject,
         "reset_url": reset_url,
+        **{
+            key: value
+            for key, value in receipt.items()
+            if key in {"provider_message_id", "provider_internal_id", "data_response"}
+        },
     }
     warning = smtp_email_delivery_warning()
     if warning:

backend/app/services/jellyfin_sync.py

@@ -6,12 +6,15 @@ from ..clients.jellyfin import JellyfinClient
 from ..db import (
     create_user_if_missing,
     get_user_by_username,
+    set_user_email,
     set_user_auth_provider,
     set_user_jellyseerr_id,
 )
 from ..runtime import get_runtime_settings
 from .user_cache import (
     build_jellyseerr_candidate_map,
+    extract_jellyseerr_user_email,
+    find_matching_jellyseerr_user,
     get_cached_jellyseerr_users,
     match_jellyseerr_user_id,
     save_jellyfin_users_cache,
@@ -41,10 +44,13 @@ async def sync_jellyfin_users() -> int:
         if not name:
             continue
         matched_id = match_jellyseerr_user_id(name, candidate_map) if candidate_map else None
+        matched_seerr_user = find_matching_jellyseerr_user(name, jellyseerr_users or [])
+        matched_email = extract_jellyseerr_user_email(matched_seerr_user)
         created = create_user_if_missing(
             name,
             "jellyfin-user",
             role="user",
+            email=matched_email,
             auth_provider="jellyfin",
             jellyseerr_user_id=matched_id,
         )
@@ -60,6 +66,8 @@ async def sync_jellyfin_users() -> int:
                 set_user_auth_provider(name, "jellyfin")
             if matched_id is not None:
                 set_user_jellyseerr_id(name, matched_id)
+            if matched_email:
+                set_user_email(name, matched_email)
     return imported
 
 

backend/app/services/password_reset.py

@@ -112,6 +112,9 @@ async def _fetch_all_seerr_users() -> list[dict]:
 
 def _resolve_seerr_user_email(seerr_user: Optional[dict], local_user: Optional[dict]) -> Optional[str]:
     if isinstance(local_user, dict):
+        stored_email = str(local_user.get("email") or "").strip()
+        if "@" in stored_email:
+            return stored_email
         username = str(local_user.get("username") or "").strip()
         if "@" in username:
             return username

backend/app/services/snapshot.py

@@ -1,6 +1,7 @@
 from typing import Any, Dict, List, Optional
 import asyncio
 import logging
+import re
 from datetime import datetime, timezone
 from urllib.parse import quote
 import httpx
@@ -57,6 +58,100 @@ def _pick_first(value: Any) -> Optional[Dict[str, Any]]:
     return None
 
 
+def _normalize_media_title(value: Any) -> Optional[str]:
+    if not isinstance(value, str):
+        return None
+    normalized = re.sub(r"[^a-z0-9]+", " ", value.lower()).strip()
+    return normalized or None
+
+
+def _canonical_provider_key(value: str) -> str:
+    normalized = value.strip().lower()
+    if normalized.endswith("id"):
+        normalized = normalized[:-2]
+    return normalized
+
+
+def extract_request_provider_ids(payload: Any) -> Dict[str, str]:
+    provider_ids: Dict[str, str] = {}
+    candidates: List[Any] = []
+    if isinstance(payload, dict):
+        candidates.append(payload)
+        media = payload.get("media")
+        if isinstance(media, dict):
+            candidates.append(media)
+    for candidate in candidates:
+        if not isinstance(candidate, dict):
+            continue
+        embedded = candidate.get("ProviderIds") or candidate.get("providerIds")
+        if isinstance(embedded, dict):
+            for key, value in embedded.items():
+                if value is None:
+                    continue
+                text = str(value).strip()
+                if text:
+                    provider_ids[_canonical_provider_key(str(key))] = text
+        for key in ("tmdbId", "tvdbId", "imdbId", "tmdb_id", "tvdb_id", "imdb_id"):
+            value = candidate.get(key)
+            if value is None:
+                continue
+            text = str(value).strip()
+            if text:
+                provider_ids[_canonical_provider_key(key)] = text
+    return provider_ids
+
+
+def jellyfin_item_matches_request(
+    item: Dict[str, Any],
+    *,
+    title: Optional[str],
+    year: Optional[int],
+    request_type: RequestType,
+    request_payload: Optional[Dict[str, Any]] = None,
+) -> bool:
+    request_provider_ids = extract_request_provider_ids(request_payload or {})
+    item_provider_ids = extract_request_provider_ids(item)
+
+    provider_priority = ("tmdb", "tvdb", "imdb")
+    for key in provider_priority:
+        request_id = request_provider_ids.get(key)
+        item_id = item_provider_ids.get(key)
+        if request_id and item_id and request_id == item_id:
+            return True
+
+    request_title = _normalize_media_title(title)
+    if not request_title:
+        return False
+
+    item_titles = [
+        _normalize_media_title(item.get("Name")),
+        _normalize_media_title(item.get("OriginalTitle")),
+        _normalize_media_title(item.get("SortName")),
+        _normalize_media_title(item.get("SeriesName")),
+        _normalize_media_title(item.get("title")),
+    ]
+    item_titles = [candidate for candidate in item_titles if candidate]
+
+    item_year = item.get("ProductionYear") or item.get("Year")
+    try:
+        item_year_value = int(item_year) if item_year is not None else None
+    except (TypeError, ValueError):
+        item_year_value = None
+
+    if year and item_year_value and int(year) != item_year_value:
+        return False
+
+    if request_title in item_titles:
+        return True
+
+    if request_type == RequestType.tv:
+        for candidate in item_titles:
+            if candidate and (candidate.startswith(request_title) or request_title.startswith(candidate)):
+                return True
+
+    return False
+
+
 def _extract_http_error_message(exc: httpx.HTTPStatusError) -> Optional[str]:
     response = exc.response
     if response is None:
@@ -513,7 +608,7 @@ async def build_snapshot(request_id: str) -> Snapshot:
     if jellyfin.configured() and snapshot.title:
         types = ["Movie"] if snapshot.request_type == RequestType.movie else ["Series"]
         try:
-            search = await jellyfin.search_items(snapshot.title, types)
+            search = await jellyfin.search_items(snapshot.title, types, limit=50)
         except Exception:
             search = None
         if isinstance(search, dict):
@@ -521,11 +616,13 @@ async def build_snapshot(request_id: str) -> Snapshot:
             for item in items:
                 if not isinstance(item, dict):
                     continue
-                name = item.get("Name") or item.get("title")
+                if jellyfin_item_matches_request(
-                year = item.get("ProductionYear") or item.get("Year")
+                    item,
-                if name and name.strip().lower() == (snapshot.title or "").strip().lower():
+                    title=snapshot.title,
-                    if snapshot.year and year and int(year) != int(snapshot.year):
+                    year=snapshot.year,
-                        continue
+                    request_type=snapshot.request_type,
+                    request_payload=jelly_request,
+                ):
                     jellyfin_available = True
                     jellyfin_item = item
                     break
@@ -646,12 +743,22 @@ async def build_snapshot(request_id: str) -> Snapshot:
         snapshot.state = NormalizedState.added_to_arr
         snapshot.state_reason = "Item is present in Sonarr/Radarr"
 
-    if jellyfin_available and snapshot.state not in {
+    if jellyfin_available:
-        NormalizedState.downloading,
+        missing_episodes = arr_details.get("missingEpisodes")
-        NormalizedState.importing,
+        if snapshot.request_type == RequestType.tv and isinstance(missing_episodes, dict) and missing_episodes:
-    }:
+            snapshot.state = NormalizedState.importing
-        snapshot.state = NormalizedState.completed
+            snapshot.state_reason = "Some episodes are available in Jellyfin, but the request is still incomplete."
-        snapshot.state_reason = "Ready to watch in Jellyfin."
+            for hop in timeline:
+                if hop.service == "Seerr":
+                    hop.status = "Partially ready"
+        else:
+            snapshot.state = NormalizedState.completed
+            snapshot.state_reason = "Ready to watch in Jellyfin."
+            for hop in timeline:
+                if hop.service == "Seerr":
+                    hop.status = "Available"
+                elif hop.service == "Sonarr/Radarr" and hop.status not in {"error"}:
+                    hop.status = "available"
 
     snapshot.timeline = timeline
     actions: List[ActionOption] = []

backend/app/services/user_cache.py

@@ -89,6 +89,33 @@ def build_jellyseerr_candidate_map(users: List[Dict[str, Any]]) -> Dict[str, int
     return candidate_to_id
 
 
+def find_matching_jellyseerr_user(
+    identifier: str, users: List[Dict[str, Any]]
+) -> Optional[Dict[str, Any]]:
+    target_handles = set(_normalized_handles(identifier))
+    if not target_handles:
+        return None
+    for user in users:
+        if not isinstance(user, dict):
+            continue
+        for key in ("username", "email", "displayName", "name"):
+            if target_handles.intersection(_normalized_handles(user.get(key))):
+                return user
+    return None
+
+
+def extract_jellyseerr_user_email(user: Optional[Dict[str, Any]]) -> Optional[str]:
+    if not isinstance(user, dict):
+        return None
+    value = user.get("email")
+    if not isinstance(value, str):
+        return None
+    candidate = value.strip()
+    if not candidate or "@" not in candidate:
+        return None
+    return candidate
+
+
 def match_jellyseerr_user_id(
     username: str, candidate_map: Dict[str, int]
 ) -> Optional[int]:

backend/requirements.txt

@@ -3,7 +3,7 @@ uvicorn==0.41.0
 httpx==0.28.1
 pydantic==2.12.5
 pydantic-settings==2.13.1
-python-jose[cryptography]==3.5.0
+PyJWT==2.11.0
 passlib==1.7.4
 python-multipart==0.0.22
 Pillow==12.1.1

backend/tests/test_backend_quality.py

@@ -0,0 +1,145 @@
+import os
+import tempfile
+import unittest
+from unittest.mock import AsyncMock, patch
+
+from fastapi import HTTPException
+from starlette.requests import Request
+
+from backend.app import db
+from backend.app.config import settings
+from backend.app.routers import auth as auth_router
+from backend.app.security import PASSWORD_POLICY_MESSAGE, validate_password_policy
+from backend.app.services import password_reset
+
+
+def _build_request(ip: str = "127.0.0.1", user_agent: str = "backend-test") -> Request:
+    scope = {
+        "type": "http",
+        "http_version": "1.1",
+        "method": "POST",
+        "scheme": "http",
+        "path": "/auth/password/forgot",
+        "raw_path": b"/auth/password/forgot",
+        "query_string": b"",
+        "headers": [(b"user-agent", user_agent.encode("utf-8"))],
+        "client": (ip, 12345),
+        "server": ("testserver", 8000),
+    }
+
+    async def receive() -> dict:
+        return {"type": "http.request", "body": b"", "more_body": False}
+
+    return Request(scope, receive)
+
+
+class TempDatabaseMixin:
+    def setUp(self) -> None:
+        super_method = getattr(super(), "setUp", None)
+        if callable(super_method):
+            super_method()
+        self._tempdir = tempfile.TemporaryDirectory(ignore_cleanup_errors=True)
+        self._original_sqlite_path = settings.sqlite_path
+        self._original_journal_mode = getattr(settings, "sqlite_journal_mode", "DELETE")
+        settings.sqlite_path = os.path.join(self._tempdir.name, "test.db")
+        settings.sqlite_journal_mode = "DELETE"
+        auth_router._LOGIN_ATTEMPTS_BY_IP.clear()
+        auth_router._LOGIN_ATTEMPTS_BY_USER.clear()
+        auth_router._RESET_ATTEMPTS_BY_IP.clear()
+        auth_router._RESET_ATTEMPTS_BY_IDENTIFIER.clear()
+        db.init_db()
+
+    def tearDown(self) -> None:
+        settings.sqlite_path = self._original_sqlite_path
+        settings.sqlite_journal_mode = self._original_journal_mode
+        auth_router._LOGIN_ATTEMPTS_BY_IP.clear()
+        auth_router._LOGIN_ATTEMPTS_BY_USER.clear()
+        auth_router._RESET_ATTEMPTS_BY_IP.clear()
+        auth_router._RESET_ATTEMPTS_BY_IDENTIFIER.clear()
+        self._tempdir.cleanup()
+        super_method = getattr(super(), "tearDown", None)
+        if callable(super_method):
+            super_method()
+
+
+class PasswordPolicyTests(unittest.TestCase):
+    def test_validate_password_policy_rejects_short_passwords(self) -> None:
+        with self.assertRaisesRegex(ValueError, PASSWORD_POLICY_MESSAGE):
+            validate_password_policy("short")
+
+    def test_validate_password_policy_trims_whitespace(self) -> None:
+        self.assertEqual(validate_password_policy("  password123  "), "password123")
+
+
+class DatabaseEmailTests(TempDatabaseMixin, unittest.TestCase):
+    def test_set_user_email_is_case_insensitive(self) -> None:
+        created = db.create_user_if_missing(
+            "MixedCaseUser",
+            "password123",
+            email=None,
+            auth_provider="local",
+        )
+        self.assertTrue(created)
+        updated = db.set_user_email("mixedcaseuser", "mixed@example.com")
+        self.assertTrue(updated)
+        stored = db.get_user_by_username("MIXEDCASEUSER")
+        self.assertIsNotNone(stored)
+        self.assertEqual(stored.get("email"), "mixed@example.com")
+
+
+class AuthFlowTests(TempDatabaseMixin, unittest.IsolatedAsyncioTestCase):
+    async def test_forgot_password_is_rate_limited(self) -> None:
+        request = _build_request(ip="10.1.2.3")
+        payload = {"identifier": "resetuser@example.com"}
+        with patch.object(auth_router, "smtp_email_config_ready", return_value=(True, "")), patch.object(
+            auth_router,
+            "request_password_reset",
+            new=AsyncMock(return_value={"status": "ok", "issued": False}),
+        ):
+            for _ in range(3):
+                result = await auth_router.forgot_password(payload, request)
+                self.assertEqual(result["status"], "ok")
+
+            with self.assertRaises(HTTPException) as context:
+                await auth_router.forgot_password(payload, request)
+
+        self.assertEqual(context.exception.status_code, 429)
+        self.assertEqual(
+            context.exception.detail,
+            "Too many password reset attempts. Try again shortly.",
+        )
+
+    async def test_request_password_reset_prefers_local_user_email(self) -> None:
+        db.create_user_if_missing(
+            "ResetUser",
+            "password123",
+            email="local@example.com",
+            auth_provider="local",
+        )
+        with patch.object(
+            password_reset,
+            "send_password_reset_email",
+            new=AsyncMock(return_value={"status": "ok"}),
+        ) as send_email:
+            result = await password_reset.request_password_reset("ResetUser")
+
+        self.assertTrue(result["issued"])
+        self.assertEqual(result["recipient_email"], "local@example.com")
+        send_email.assert_awaited_once()
+        self.assertEqual(send_email.await_args.kwargs["recipient_email"], "local@example.com")
+
+    async def test_profile_invite_requires_recipient_email(self) -> None:
+        current_user = {
+            "username": "invite-owner",
+            "role": "user",
+            "invite_management_enabled": True,
+            "profile_id": None,
+        }
+        with self.assertRaises(HTTPException) as context:
+            await auth_router.create_profile_invite({"label": "Missing email"}, current_user)
+
+        self.assertEqual(context.exception.status_code, 400)
+        self.assertEqual(
+            context.exception.detail,
+            "recipient_email is required and must be a valid email address.",
+        )

frontend/app/admin/SettingsPage.tsx

@@ -40,6 +40,10 @@ const SECTION_LABELS: Record<string, string> = {
 const BOOL_SETTINGS = new Set([
   'jellyfin_sync_to_arr',
   'site_banner_enabled',
+  'site_login_show_jellyfin_login',
+  'site_login_show_local_login',
+  'site_login_show_forgot_password',
+  'site_login_show_signup_link',
   'magent_proxy_enabled',
   'magent_proxy_trust_forwarded_headers',
   'magent_ssl_bind_enabled',
@@ -104,7 +108,7 @@ const SECTION_DESCRIPTIONS: Record<string, string> = {
   qbittorrent: 'Downloader connection settings.',
   requests: 'Control how often requests are refreshed and cleaned up.',
   log: 'Activity log for troubleshooting.',
-  site: 'Sitewide banner and version details. The changelog is generated from git history during release builds.',
+  site: 'Sitewide banner, login page visibility, and version details. The changelog is generated from git history during release builds.',
 }
 
 const SETTINGS_SECTION_MAP: Record<string, string | null> = {
@@ -239,6 +243,31 @@ const MAGENT_GROUPS_BY_SECTION: Record<string, Set<string>> = {
   ]),
 }
 
+const SITE_SECTION_GROUPS: Array<{
+  key: string
+  title: string
+  description: string
+  keys: string[]
+}> = [
+  {
+    key: 'site-banner',
+    title: 'Site Banner',
+    description: 'Control the sitewide banner message, tone, and visibility.',
+    keys: ['site_banner_enabled', 'site_banner_tone', 'site_banner_message'],
+  },
+  {
+    key: 'site-login',
+    title: 'Login Page Behaviour',
+    description: 'Control which sign-in and recovery options are shown on the logged-out login page.',
+    keys: [
+      'site_login_show_jellyfin_login',
+      'site_login_show_local_login',
+      'site_login_show_forgot_password',
+      'site_login_show_signup_link',
+    ],
+  },
+]
+
 const SETTING_LABEL_OVERRIDES: Record<string, string> = {
   jellyseerr_base_url: 'Seerr base URL',
   jellyseerr_api_key: 'Seerr API key',
@@ -280,6 +309,10 @@ const SETTING_LABEL_OVERRIDES: Record<string, string> = {
   magent_notify_push_device: 'Device / target',
   magent_notify_webhook_enabled: 'Generic webhook notifications enabled',
   magent_notify_webhook_url: 'Generic webhook URL',
+  site_login_show_jellyfin_login: 'Login page: Jellyfin sign-in',
+  site_login_show_local_login: 'Login page: local Magent sign-in',
+  site_login_show_forgot_password: 'Login page: forgot password',
+  site_login_show_signup_link: 'Login page: invite signup link',
   log_file_max_bytes: 'Log file max size (bytes)',
   log_file_backup_count: 'Rotated log files to keep',
   log_http_client_level: 'Service HTTP log level',
@@ -551,6 +584,7 @@ export default function SettingsPage({ section }: SettingsPageProps) {
 
   const settingsSection = SETTINGS_SECTION_MAP[section] ?? null
   const isMagentGroupedSection = section === 'magent' || section === 'general' || section === 'notifications'
+  const isSiteGroupedSection = section === 'site'
   const visibleSections = settingsSection ? [settingsSection] : []
   const isCacheSection = section === 'cache'
   const cacheSettingKeys = new Set(['requests_sync_ttl_minutes', 'requests_data_source'])
@@ -564,6 +598,15 @@ export default function SettingsPage({ section }: SettingsPageProps) {
     'requests_cleanup_time',
     'requests_cleanup_days',
   ]
+  const siteSettingOrder = [
+    'site_banner_enabled',
+    'site_banner_message',
+    'site_banner_tone',
+    'site_login_show_jellyfin_login',
+    'site_login_show_local_login',
+    'site_login_show_forgot_password',
+    'site_login_show_signup_link',
+  ]
   const sortByOrder = (items: AdminSetting[], order: string[]) => {
     const position = new Map(order.map((key, index) => [key, index]))
     return [...items].sort((a, b) => {
@@ -603,6 +646,22 @@ export default function SettingsPage({ section }: SettingsPageProps) {
           })
           return groups
         })()
+      : isSiteGroupedSection
+        ? (() => {
+            const siteItems = groupedSettings.site ?? []
+            const byKey = new Map(siteItems.map((item) => [item.key, item]))
+            return SITE_SECTION_GROUPS.map((group) => {
+              const items = group.keys
+                .map((key) => byKey.get(key))
+                .filter((item): item is AdminSetting => Boolean(item))
+              return {
+                key: group.key,
+                title: group.title,
+                description: group.description,
+                items,
+              }
+            })
+          })()
       : visibleSections.map((sectionKey) => ({
           key: sectionKey,
           title: SECTION_LABELS[sectionKey] ?? sectionKey,
@@ -615,6 +674,9 @@ export default function SettingsPage({ section }: SettingsPageProps) {
             if (sectionKey === 'requests') {
               return sortByOrder(filtered, requestSettingOrder)
             }
+            if (sectionKey === 'site') {
+              return sortByOrder(filtered, siteSettingOrder)
+            }
             return filtered
           })(),
         }))
@@ -748,6 +810,10 @@ export default function SettingsPage({ section }: SettingsPageProps) {
     site_banner_enabled: 'Enable a sitewide banner for announcements.',
     site_banner_message: 'Short banner message for maintenance or updates.',
     site_banner_tone: 'Visual tone for the banner.',
+    site_login_show_jellyfin_login: 'Show the Jellyfin login button on the login page.',
+    site_login_show_local_login: 'Show the local Magent login button on the login page.',
+    site_login_show_forgot_password: 'Show the forgot-password link on the login page.',
+    site_login_show_signup_link: 'Show the invite signup link on the login page.',
     site_changelog: 'One update per line for the public changelog.',
   }
 
@@ -1672,7 +1738,7 @@ export default function SettingsPage({ section }: SettingsPageProps) {
               )}
             </div>
             {(sectionGroup.description || SECTION_DESCRIPTIONS[sectionGroup.key]) &&
-              (!settingsSection || isMagentGroupedSection) && (
+              (!settingsSection || isMagentGroupedSection || isSiteGroupedSection) && (
                 <p className="section-subtitle">
                   {sectionGroup.description || SECTION_DESCRIPTIONS[sectionGroup.key]}
                 </p>
@@ -2148,11 +2214,12 @@ export default function SettingsPage({ section }: SettingsPageProps) {
                   const isPemField =
                     setting.key === 'magent_ssl_certificate_pem' ||
                     setting.key === 'magent_ssl_private_key_pem'
+                  const shouldSpanFull = isPemField || setting.key === 'site_banner_message'
                   return (
                     <label
                       key={setting.key}
                       data-helper={helperText || undefined}
-                      className={isPemField ? 'field-span-full' : undefined}
+                      className={shouldSpanFull ? 'field-span-full' : undefined}
                     >
                       <span className="label-row">
                         <span>{labelFromKey(setting.key)}</span>
@@ -2229,14 +2296,6 @@ export default function SettingsPage({ section }: SettingsPageProps) {
                   />
                 </label>
               ) : null}
-              <button
-                type="button"
-                className="settings-action-button"
-                onClick={() => void saveSettingGroup(sectionGroup)}
-                disabled={sectionSaving[sectionGroup.key] || sectionTesting[sectionGroup.key]}
-              >
-                {sectionSaving[sectionGroup.key] ? 'Saving...' : 'Save section'}
-              </button>
               {getSectionTestLabel(sectionGroup.key) ? (
                 <button
                   type="button"
@@ -2249,6 +2308,14 @@ export default function SettingsPage({ section }: SettingsPageProps) {
                     : getSectionTestLabel(sectionGroup.key)}
                 </button>
               ) : null}
+              <button
+                type="button"
+                className="settings-action-button"
+                onClick={() => void saveSettingGroup(sectionGroup)}
+                disabled={sectionSaving[sectionGroup.key] || sectionTesting[sectionGroup.key]}
+              >
+                {sectionSaving[sectionGroup.key] ? 'Saving...' : 'Save section'}
+              </button>
             </div>
           </section>
         ))}

frontend/app/admin/invites/page.tsx

@@ -156,6 +156,8 @@ const formatDate = (value?: string | null) => {
   return date.toLocaleString()
 }
 
+const isValidEmail = (value: string) => /^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(value.trim())
+
 const isInviteTraceRowInvited = (row: InviteTraceRow) =>
   Boolean(String(row.inviterUsername || '').trim() || String(row.inviteCode || '').trim())
 
@@ -349,6 +351,17 @@ export default function AdminInviteManagementPage() {
 
   const saveInvite = async (event: React.FormEvent) => {
     event.preventDefault()
+    const recipientEmail = inviteForm.recipient_email.trim()
+    if (!recipientEmail) {
+      setError('Recipient email is required.')
+      setStatus(null)
+      return
+    }
+    if (!isValidEmail(recipientEmail)) {
+      setError('Recipient email must be valid.')
+      setStatus(null)
+      return
+    }
     setInviteSaving(true)
     setError(null)
     setStatus(null)
@@ -363,7 +376,7 @@ export default function AdminInviteManagementPage() {
         max_uses: inviteForm.max_uses || null,
         enabled: inviteForm.enabled,
         expires_at: inviteForm.expires_at || null,
-        recipient_email: inviteForm.recipient_email || null,
+        recipient_email: recipientEmail,
         send_email: inviteForm.send_email,
         message: inviteForm.message || null,
       }
@@ -1607,18 +1620,19 @@ export default function AdminInviteManagementPage() {
               <div className="invite-form-row">
                 <div className="invite-form-row-label">
                   <span>Delivery</span>
-                  <small>Save a recipient email and optionally send the invite immediately.</small>
+                  <small>Recipient email is required. You can optionally send the invite immediately after saving.</small>
                 </div>
                 <div className="invite-form-row-control invite-form-row-control--stacked">
                   <label>
-                    <span>Recipient email</span>
+                    <span>Recipient email (required)</span>
                     <input
                       type="email"
+                      required
                       value={inviteForm.recipient_email}
                       onChange={(e) =>
                         setInviteForm((current) => ({ ...current, recipient_email: e.target.value }))
                       }
-                      placeholder="person@example.com"
+                      placeholder="Required recipient email"
                     />
                   </label>
                   <label>

frontend/app/admin/requests-all/page.tsx

@@ -15,6 +15,17 @@ type RequestRow = {
   createdAt?: string | null
 }
 
+const REQUEST_STAGE_OPTIONS = [
+  { value: 'all', label: 'All stages' },
+  { value: 'pending', label: 'Waiting for approval' },
+  { value: 'approved', label: 'Approved' },
+  { value: 'in_progress', label: 'In progress' },
+  { value: 'working', label: 'Working on it' },
+  { value: 'partial', label: 'Partially ready' },
+  { value: 'ready', label: 'Ready to watch' },
+  { value: 'declined', label: 'Declined' },
+]
+
 const formatDateTime = (value?: string | null) => {
   if (!value) return 'Unknown'
   const date = new Date(value)
@@ -30,6 +41,7 @@ export default function AdminRequestsAllPage() {
   const [error, setError] = useState<string | null>(null)
   const [pageSize, setPageSize] = useState(50)
   const [page, setPage] = useState(1)
+  const [stage, setStage] = useState('all')
 
   const pageCount = useMemo(() => {
     if (!total || pageSize <= 0) return 1
@@ -46,8 +58,15 @@ export default function AdminRequestsAllPage() {
     try {
       const baseUrl = getApiBase()
       const skip = (page - 1) * pageSize
+      const params = new URLSearchParams({
+        take: String(pageSize),
+        skip: String(skip),
+      })
+      if (stage !== 'all') {
+        params.set('stage', stage)
+      }
       const response = await authFetch(
-        `${baseUrl}/admin/requests/all?take=${pageSize}&skip=${skip}`
+        `${baseUrl}/admin/requests/all?${params.toString()}`
       )
       if (!response.ok) {
         if (response.status === 401) {
@@ -74,7 +93,7 @@ export default function AdminRequestsAllPage() {
 
   useEffect(() => {
     void load()
-  }, [page, pageSize])
+  }, [page, pageSize, stage])
 
   useEffect(() => {
     if (page > pageCount) {
@@ -82,6 +101,10 @@ export default function AdminRequestsAllPage() {
     }
   }, [pageCount, page])
 
+  useEffect(() => {
+    setPage(1)
+  }, [stage])
+
   return (
     <AdminShell
       title="All requests"
@@ -98,6 +121,16 @@ export default function AdminRequestsAllPage() {
             <span>{total.toLocaleString()} total</span>
           </div>
           <div className="admin-toolbar-actions">
+            <label className="admin-select">
+              <span>Stage</span>
+              <select value={stage} onChange={(e) => setStage(e.target.value)}>
+                {REQUEST_STAGE_OPTIONS.map((option) => (
+                  <option key={option.value} value={option.value}>
+                    {option.label}
+                  </option>
+                ))}
+              </select>
+            </label>
             <label className="admin-select">
               <span>Per page</span>
               <select value={pageSize} onChange={(e) => setPageSize(Number(e.target.value))}>

frontend/app/globals.css

@@ -1527,6 +1527,13 @@ button span {
   color: var(--ink-muted);
 }
 
+.recent-filter-group {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 10px;
+  align-items: center;
+}
+
 .recent-filter select {
   padding: 8px 12px;
   font-size: 13px;
@@ -6068,6 +6075,52 @@ textarea {
   background: rgba(255, 255, 255, 0.03);
 }
 
+.diagnostic-detail-panel {
+  display: grid;
+  gap: 0.9rem;
+}
+
+.diagnostic-detail-group {
+  display: grid;
+  gap: 0.6rem;
+}
+
+.diagnostic-detail-group h4 {
+  margin: 0;
+  font-size: 0.86rem;
+  letter-spacing: 0.06em;
+  text-transform: uppercase;
+  color: var(--ink-muted);
+}
+
+.diagnostic-detail-grid {
+  display: grid;
+  grid-template-columns: repeat(auto-fit, minmax(9rem, 1fr));
+  gap: 0.7rem;
+}
+
+.diagnostic-detail-item {
+  display: grid;
+  gap: 0.2rem;
+  min-width: 0;
+  padding: 0.75rem;
+  border-radius: 0.8rem;
+  border: 1px solid rgba(255, 255, 255, 0.06);
+  background: rgba(255, 255, 255, 0.025);
+}
+
+.diagnostic-detail-item span {
+  font-size: 0.76rem;
+  letter-spacing: 0.05em;
+  text-transform: uppercase;
+  color: var(--muted);
+}
+
+.diagnostic-detail-item strong {
+  line-height: 1.35;
+  overflow-wrap: anywhere;
+}
+
 .diagnostics-rail-metrics {
   display: grid;
   gap: 0.75rem;

frontend/app/login/page.tsx

@@ -1,19 +1,36 @@
 'use client'
 
 import { useRouter } from 'next/navigation'
-import { useState } from 'react'
+import { useEffect, useState } from 'react'
 import { getApiBase, setToken, clearToken } from '../lib/auth'
 import BrandingLogo from '../ui/BrandingLogo'
 
+const DEFAULT_LOGIN_OPTIONS = {
+  showJellyfinLogin: true,
+  showLocalLogin: true,
+  showForgotPassword: true,
+  showSignupLink: true,
+}
+
 export default function LoginPage() {
   const router = useRouter()
   const [username, setUsername] = useState('')
   const [password, setPassword] = useState('')
   const [error, setError] = useState<string | null>(null)
   const [loading, setLoading] = useState(false)
+  const [loginOptions, setLoginOptions] = useState(DEFAULT_LOGIN_OPTIONS)
+  const primaryMode: 'jellyfin' | 'local' | null = loginOptions.showJellyfinLogin
+    ? 'jellyfin'
+    : loginOptions.showLocalLogin
+      ? 'local'
+      : null
 
   const submit = async (event: React.FormEvent, mode: 'local' | 'jellyfin') => {
     event.preventDefault()
+    if (!primaryMode) {
+      setError('Login is currently disabled. Contact an administrator.')
+      return
+    }
     setError(null)
     setLoading(true)
     try {
@@ -48,12 +65,63 @@ export default function LoginPage() {
     }
   }
 
+  useEffect(() => {
+    let active = true
+    const loadLoginOptions = async () => {
+      try {
+        const baseUrl = getApiBase()
+        const response = await fetch(`${baseUrl}/site/public`)
+        if (!response.ok) {
+          return
+        }
+        const data = await response.json()
+        const login = data?.login ?? {}
+        if (!active) return
+        setLoginOptions({
+          showJellyfinLogin: login.showJellyfinLogin !== false,
+          showLocalLogin: login.showLocalLogin !== false,
+          showForgotPassword: login.showForgotPassword !== false,
+          showSignupLink: login.showSignupLink !== false,
+        })
+      } catch (err) {
+        console.error(err)
+      }
+    }
+    void loadLoginOptions()
+    return () => {
+      active = false
+    }
+  }, [])
+
+  const loginHelpText = (() => {
+    if (loginOptions.showJellyfinLogin && loginOptions.showLocalLogin) {
+      return 'Use your Jellyfin account, or sign in with a local Magent admin account.'
+    }
+    if (loginOptions.showJellyfinLogin) {
+      return 'Use your Jellyfin account to sign in.'
+    }
+    if (loginOptions.showLocalLogin) {
+      return 'Use your local Magent admin account to sign in.'
+    }
+    return 'No sign-in methods are currently available. Contact an administrator.'
+  })()
+
   return (
     <main className="card auth-card">
       <BrandingLogo className="brand-logo brand-logo--login" />
       <h1>Sign in</h1>
-      <p className="lede">Use your Jellyfin account, or sign in with a local Magent admin account.</p>
+      <p className="lede">{loginHelpText}</p>
-      <form onSubmit={(event) => submit(event, 'jellyfin')} className="auth-form">
+      <form
+        onSubmit={(event) => {
+          if (!primaryMode) {
+            event.preventDefault()
+            setError('Login is currently disabled. Contact an administrator.')
+            return
+          }
+          void submit(event, primaryMode)
+        }}
+        className="auth-form"
+      >
         <label>
           Username
           <input
@@ -73,24 +141,35 @@ export default function LoginPage() {
         </label>
         {error && <div className="error-banner">{error}</div>}
         <div className="auth-actions">
-          <button type="submit" disabled={loading}>
+          {loginOptions.showJellyfinLogin ? (
-            {loading ? 'Signing in...' : 'Login with Jellyfin account'}
+            <button type="submit" disabled={loading}>
-          </button>
+              {loading ? 'Signing in...' : 'Login with Jellyfin account'}
+            </button>
+          ) : null}
         </div>
-        <button
+        {loginOptions.showLocalLogin ? (
-          type="button"
+          <button
-          className="ghost-button"
+            type="button"
-          disabled={loading}
+            className="ghost-button"
-          onClick={(event) => submit(event, 'local')}
+            disabled={loading}
-        >
+            onClick={(event) => submit(event, 'local')}
-          Sign in with Magent account
+          >
-        </button>
+            Sign in with Magent account
-        <a className="ghost-button" href="/forgot-password">
+          </button>
-          Forgot password?
+        ) : null}
-        </a>
+        {loginOptions.showForgotPassword ? (
-        <a className="ghost-button" href="/signup">
+          <a className="ghost-button" href="/forgot-password">
-          Have an invite? Create your account (Jellyfin + Magent)
+            Forgot password?
-        </a>
+          </a>
+        ) : null}
+        {loginOptions.showSignupLink ? (
+          <a className="ghost-button" href="/signup">
+            Have an invite? Create your account (Jellyfin + Magent)
+          </a>
+        ) : null}
+        {!loginOptions.showJellyfinLogin && !loginOptions.showLocalLogin ? (
+          <div className="error-banner">Login is currently disabled. Contact an administrator.</div>
+        ) : null}
       </form>
     </main>
   )

frontend/app/page.tsx

@@ -22,6 +22,17 @@ const normalizeRecentResults = (items: any[]) =>
       }
     })
 
+const REQUEST_STAGE_OPTIONS = [
+  { value: 'all', label: 'All stages' },
+  { value: 'pending', label: 'Waiting' },
+  { value: 'approved', label: 'Approved' },
+  { value: 'in_progress', label: 'In progress' },
+  { value: 'working', label: 'Working' },
+  { value: 'partial', label: 'Partial' },
+  { value: 'ready', label: 'Ready' },
+  { value: 'declined', label: 'Declined' },
+]
+
 export default function HomePage() {
   const router = useRouter()
   const [query, setQuery] = useState('')
@@ -38,11 +49,20 @@ export default function HomePage() {
   const [recentError, setRecentError] = useState<string | null>(null)
   const [recentLoading, setRecentLoading] = useState(false)
   const [searchResults, setSearchResults] = useState<
-    { title: string; year?: number; type?: string; requestId?: number; statusLabel?: string }[]
+    {
+      title: string
+      year?: number
+      type?: string
+      requestId?: number
+      statusLabel?: string
+      requestedBy?: string | null
+      accessible?: boolean
+    }[]
   >([])
   const [searchError, setSearchError] = useState<string | null>(null)
   const [role, setRole] = useState<string | null>(null)
   const [recentDays, setRecentDays] = useState(90)
+  const [recentStage, setRecentStage] = useState('all')
   const [authReady, setAuthReady] = useState(false)
   const [servicesStatus, setServicesStatus] = useState<
     { overall: string; services: { name: string; status: string; message?: string }[] } | null
@@ -143,9 +163,14 @@ export default function HomePage() {
         setRole(userRole)
         setAuthReady(true)
         const take = userRole === 'admin' ? 50 : 6
-        const response = await authFetch(
+        const params = new URLSearchParams({
-          `${baseUrl}/requests/recent?take=${take}&days=${recentDays}`
+          take: String(take),
-        )
+          days: String(recentDays),
+        })
+        if (recentStage !== 'all') {
+          params.set('stage', recentStage)
+        }
+        const response = await authFetch(`${baseUrl}/requests/recent?${params.toString()}`)
         if (!response.ok) {
           if (response.status === 401) {
             clearToken()
@@ -167,7 +192,7 @@ export default function HomePage() {
     }
 
     load()
-  }, [recentDays])
+  }, [recentDays, recentStage])
 
   useEffect(() => {
     if (!authReady) {
@@ -222,7 +247,14 @@ export default function HomePage() {
       try {
         const streamToken = await getEventStreamToken()
         if (closed) return
-        const streamUrl = `${baseUrl}/events/stream?stream_token=${encodeURIComponent(streamToken)}&recent_days=${encodeURIComponent(String(recentDays))}`
+        const params = new URLSearchParams({
+          stream_token: streamToken,
+          recent_days: String(recentDays),
+        })
+        if (recentStage !== 'all') {
+          params.set('recent_stage', recentStage)
+        }
+        const streamUrl = `${baseUrl}/events/stream?${params.toString()}`
         source = new EventSource(streamUrl)
 
         source.onopen = () => {
@@ -282,7 +314,7 @@ export default function HomePage() {
       setLiveStreamConnected(false)
       source?.close()
     }
-  }, [authReady, recentDays])
+  }, [authReady, recentDays, recentStage])
 
   const runSearch = async (term: string) => {
     try {
@@ -299,14 +331,16 @@ export default function HomePage() {
       const data = await response.json()
       if (Array.isArray(data?.results)) {
         setSearchResults(
-          data.results.map((item: any) => ({
+            data.results.map((item: any) => ({
-            title: item.title,
+              title: item.title,
-            year: item.year,
+              year: item.year,
-            type: item.type,
+              type: item.type,
-            requestId: item.requestId,
+              requestId: item.requestId,
-            statusLabel: item.statusLabel,
+              statusLabel: item.statusLabel,
-          }))
+              requestedBy: item.requestedBy ?? null,
-        )
+              accessible: Boolean(item.accessible),
+            }))
+          )
         setSearchError(null)
       }
     } catch (error) {
@@ -403,19 +437,34 @@ export default function HomePage() {
             <div className="recent-header">
               <h2>{role === 'admin' ? 'All requests' : 'My recent requests'}</h2>
               {authReady && (
-                <label className="recent-filter">
+                <div className="recent-filter-group">
-                  <span>Show</span>
+                  <label className="recent-filter">
-                  <select
+                    <span>Show</span>
-                    value={recentDays}
+                    <select
-                    onChange={(event) => setRecentDays(Number(event.target.value))}
+                      value={recentDays}
-                  >
+                      onChange={(event) => setRecentDays(Number(event.target.value))}
-                    <option value={0}>All</option>
+                    >
-                    <option value={30}>30 days</option>
+                      <option value={0}>All</option>
-                    <option value={60}>60 days</option>
+                      <option value={30}>30 days</option>
-                    <option value={90}>90 days</option>
+                      <option value={60}>60 days</option>
-                    <option value={180}>180 days</option>
+                      <option value={90}>90 days</option>
-                  </select>
+                      <option value={180}>180 days</option>
-                </label>
+                    </select>
+                  </label>
+                  <label className="recent-filter">
+                    <span>Stage</span>
+                    <select
+                      value={recentStage}
+                      onChange={(event) => setRecentStage(event.target.value)}
+                    >
+                      {REQUEST_STAGE_OPTIONS.map((option) => (
+                        <option key={option.value} value={option.value}>
+                          {option.label}
+                        </option>
+                      ))}
+                    </select>
+                  </label>
+                </div>
               )}
             </div>
             <div className="recent-grid">
@@ -467,9 +516,10 @@ export default function HomePage() {
         <aside className="side-panel">
           <section className="main-panel find-panel">
             <div className="find-header">
-              <h1>Find my request</h1>
+              <h1>Search all requests</h1>
               <p className="lede">
-                Search by title + year, paste a request number, or pick from your recent requests.
+                Search any request by title + year or request number and see whether it already
+                exists in the system.
               </p>
             </div>
             <div className="find-controls">
@@ -518,14 +568,16 @@ export default function HomePage() {
                       key={`${item.title || 'Untitled'}-${index}`}
                       type="button"
                       disabled={!item.requestId}
-                      onClick={() => item.requestId && router.push(`/requests/${item.requestId}`)}
+                      onClick={() =>
+                        item.requestId && router.push(`/requests/${item.requestId}`)
+                      }
                     >
                       {item.title || 'Untitled'} {item.year ? `(${item.year})` : ''}{' '}
                       {!item.requestId
                         ? '- not requested'
                         : item.statusLabel
                           ? `- ${item.statusLabel}`
-                          : ''}
+                          : '- already requested'}
                     </button>
                   ))
                 )}

frontend/app/profile/invites/page.tsx

@@ -82,6 +82,8 @@ const formatDate = (value?: string | null) => {
   return date.toLocaleString()
 }
 
+const isValidEmail = (value: string) => /^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(value.trim())
+
 export default function ProfileInvitesPage() {
   const router = useRouter()
   const [profile, setProfile] = useState<ProfileInfo | null>(null)
@@ -192,6 +194,17 @@ export default function ProfileInvitesPage() {
 
   const saveInvite = async (event: React.FormEvent) => {
     event.preventDefault()
+    const recipientEmail = inviteForm.recipient_email.trim()
+    if (!recipientEmail) {
+      setInviteError('Recipient email is required.')
+      setInviteStatus(null)
+      return
+    }
+    if (!isValidEmail(recipientEmail)) {
+      setInviteError('Recipient email must be valid.')
+      setInviteStatus(null)
+      return
+    }
     setInviteSaving(true)
     setInviteError(null)
     setInviteStatus(null)
@@ -208,7 +221,7 @@ export default function ProfileInvitesPage() {
             code: inviteForm.code || null,
             label: inviteForm.label || null,
             description: inviteForm.description || null,
-            recipient_email: inviteForm.recipient_email || null,
+            recipient_email: recipientEmail,
             max_uses: inviteForm.max_uses || null,
             expires_at: inviteForm.expires_at || null,
             enabled: inviteForm.enabled,
@@ -438,13 +451,14 @@ export default function ProfileInvitesPage() {
                 <div className="invite-form-row">
                   <div className="invite-form-row-label">
                     <span>Delivery</span>
-                    <small>Save a recipient email and optionally send the invite immediately.</small>
+                    <small>Recipient email is required. You can also send the invite immediately after saving.</small>
                   </div>
                   <div className="invite-form-row-control invite-form-row-control--stacked">
                     <label>
-                      <span>Recipient email</span>
+                      <span>Recipient email (required)</span>
                       <input
                         type="email"
+                        required
                         value={inviteForm.recipient_email}
                         onChange={(event) =>
                           setInviteForm((current) => ({
@@ -452,7 +466,7 @@ export default function ProfileInvitesPage() {
                             recipient_email: event.target.value,
                           }))
                         }
-                        placeholder="friend@example.com"
+                        placeholder="Required recipient email"
                       />
                     </label>
                     <label>

frontend/app/requests/[id]/page.tsx

@@ -368,7 +368,14 @@ export default function RequestTimelinePage() {
   const jellyfinLink = snapshot.raw?.jellyfin?.link
   const posterUrl = snapshot.artwork?.poster_url
   const resolvedPoster =
-    posterUrl && posterUrl.startsWith('http') ? posterUrl : posterUrl ? `${getApiBase()}${posterUrl}` : null
+      posterUrl && posterUrl.startsWith('http') ? posterUrl : posterUrl ? `${getApiBase()}${posterUrl}` : null
+  const hasPartialReadyTimeline = snapshot.timeline.some(
+    (hop) => hop.service === 'Seerr' && hop.status === 'Partially ready'
+  )
+  const currentStatusText =
+    snapshot.state === 'IMPORTING' && hasPartialReadyTimeline
+      ? 'Partially ready'
+      : friendlyState(snapshot.state)
 
   return (
     <main className="card">
@@ -400,7 +407,7 @@ export default function RequestTimelinePage() {
       <section className="status-box">
         <div>
           <h2>Status</h2>
-          <p className="status-text">{friendlyState(snapshot.state)}</p>
+          <p className="status-text">{currentStatusText}</p>
         </div>
         <div>
           <h2>What this means</h2>

frontend/app/ui/AdminDiagnosticsPanel.tsx

@@ -56,6 +56,21 @@ type AdminDiagnosticsPanelProps = {
   embedded?: boolean
 }
 
+type DatabaseDiagnosticDetail = {
+  integrity_check?: string
+  database_path?: string
+  database_size_bytes?: number
+  wal_size_bytes?: number
+  shm_size_bytes?: number
+  page_size_bytes?: number
+  page_count?: number
+  freelist_pages?: number
+  allocated_bytes?: number
+  free_bytes?: number
+  row_counts?: Record<string, number>
+  timings_ms?: Record<string, number>
+}
+
 const REFRESH_INTERVAL_MS = 30000
 
 const STATUS_LABELS: Record<string, string> = {
@@ -85,6 +100,54 @@ function statusLabel(status: string) {
   return STATUS_LABELS[status] ?? status
 }
 
+function formatBytes(value?: number) {
+  if (typeof value !== 'number' || Number.isNaN(value) || value < 0) {
+    return '0 B'
+  }
+  if (value >= 1024 * 1024 * 1024) {
+    return `${(value / (1024 * 1024 * 1024)).toFixed(2)} GB`
+  }
+  if (value >= 1024 * 1024) {
+    return `${(value / (1024 * 1024)).toFixed(2)} MB`
+  }
+  if (value >= 1024) {
+    return `${(value / 1024).toFixed(1)} KB`
+  }
+  return `${value} B`
+}
+
+function formatDetailLabel(value: string) {
+  return value
+    .replace(/_/g, ' ')
+    .replace(/\b\w/g, (character) => character.toUpperCase())
+}
+
+function asDatabaseDiagnosticDetail(detail: unknown): DatabaseDiagnosticDetail | null {
+  if (!detail || typeof detail !== 'object' || Array.isArray(detail)) {
+    return null
+  }
+  return detail as DatabaseDiagnosticDetail
+}
+
+function renderDatabaseMetricGroup(title: string, values: Array<[string, string]>) {
+  if (values.length === 0) {
+    return null
+  }
+  return (
+    <div className="diagnostic-detail-group">
+      <h4>{title}</h4>
+      <div className="diagnostic-detail-grid">
+        {values.map(([label, value]) => (
+          <div key={`${title}-${label}`} className="diagnostic-detail-item">
+            <span>{label}</span>
+            <strong>{value}</strong>
+          </div>
+        ))}
+      </div>
+    </div>
+  )
+}
+
 export default function AdminDiagnosticsPanel({ embedded = false }: AdminDiagnosticsPanelProps) {
   const router = useRouter()
   const [loading, setLoading] = useState(true)
@@ -405,6 +468,43 @@ export default function AdminDiagnosticsPanel({ embedded = false }: AdminDiagnos
                       <span className="system-dot" />
                       <span>{isRunning ? 'Running diagnostic...' : check.message}</span>
                     </div>
+
+                    {check.key === 'database'
+                      ? (() => {
+                          const detail = asDatabaseDiagnosticDetail(check.detail)
+                          if (!detail) {
+                            return null
+                          }
+                          return (
+                            <div className="diagnostic-detail-panel">
+                              {renderDatabaseMetricGroup('Storage', [
+                                ['Database file', formatBytes(detail.database_size_bytes)],
+                                ['WAL file', formatBytes(detail.wal_size_bytes)],
+                                ['Shared memory', formatBytes(detail.shm_size_bytes)],
+                                ['Allocated bytes', formatBytes(detail.allocated_bytes)],
+                                ['Free bytes', formatBytes(detail.free_bytes)],
+                                ['Page size', formatBytes(detail.page_size_bytes)],
+                                ['Page count', `${detail.page_count?.toLocaleString() ?? 0}`],
+                                ['Freelist pages', `${detail.freelist_pages?.toLocaleString() ?? 0}`],
+                              ])}
+                              {renderDatabaseMetricGroup(
+                                'Tables',
+                                Object.entries(detail.row_counts ?? {}).map(([key, value]) => [
+                                  formatDetailLabel(key),
+                                  value.toLocaleString(),
+                                ]),
+                              )}
+                              {renderDatabaseMetricGroup(
+                                'Timings',
+                                Object.entries(detail.timings_ms ?? {}).map(([key, value]) => [
+                                  formatDetailLabel(key),
+                                  `${value.toFixed(1)} ms`,
+                                ]),
+                              )}
+                            </div>
+                          )
+                        })()
+                      : null}
                   </article>
                 )
               })}

frontend/app/users/[id]/page.tsx

@@ -20,6 +20,7 @@ type UserStats = {
 type AdminUser = {
   id?: number
   username: string
+  email?: string | null
   role: string
   auth_provider?: string | null
   last_login_at?: string | null
@@ -459,6 +460,10 @@ export default function UserDetailPage() {
                   </p>
                 </div>
                 <div className="user-detail-meta-grid">
+                  <div className="user-detail-meta-item">
+                    <span className="label">Email</span>
+                    <strong>{user.email || 'Not set'}</strong>
+                  </div>
                   <div className="user-detail-meta-item">
                     <span className="label">Seerr ID</span>
                     <strong>{user.jellyseerr_user_id ?? user.id ?? 'Unknown'}</strong>

frontend/app/users/page.tsx

@@ -9,6 +9,7 @@ import AdminShell from '../ui/AdminShell'
 type AdminUser = {
   id: number
   username: string
+  email?: string | null
   role: string
   authProvider?: string | null
   lastLoginAt?: string | null
@@ -109,6 +110,7 @@ export default function UsersPage() {
         setUsers(
           data.users.map((user: any) => ({
             username: user.username ?? 'Unknown',
+            email: user.email ?? null,
             role: user.role ?? 'user',
             authProvider: user.auth_provider ?? 'local',
             lastLoginAt: user.last_login_at ?? null,
@@ -239,6 +241,7 @@ export default function UsersPage() {
     ? users.filter((user) => {
         const fields = [
           user.username,
+          user.email || '',
           user.role,
           user.authProvider || '',
           user.profileId != null ? String(user.profileId) : '',
@@ -419,6 +422,9 @@ export default function UsersPage() {
                     <strong>{user.username}</strong>
                     <span className="user-grid-meta">{user.role}</span>
                   </div>
+                  <div className="user-directory-subtext">
+                    {user.email || 'No email on file'}
+                  </div>
                   <div className="user-directory-subtext">
                     Login: {user.authProvider || 'local'} • Profile: {user.profileId ?? 'None'}
                   </div>

frontend/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "magent-frontend",
-  "version": "0203262044",
+  "version": "0403261321",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "magent-frontend",
-      "version": "0203262044",
+      "version": "0403261321",
       "dependencies": {
         "next": "16.1.6",
         "react": "19.2.4",

frontend/package.json

@@ -1,7 +1,7 @@
 {
   "name": "magent-frontend",
   "private": true,
-  "version": "0203262044",
+  "version": "0403261321",
   "scripts": {
     "dev": "next dev",
     "build": "next build",

scripts/build_release.ps1

@@ -3,6 +3,11 @@ $ErrorActionPreference = "Stop"
 $repoRoot = Resolve-Path "$PSScriptRoot\\.."
 Set-Location $repoRoot
 
+powershell -ExecutionPolicy Bypass -File (Join-Path $repoRoot "scripts\run_backend_quality_gate.ps1")
+if ($LASTEXITCODE -ne 0) {
+    throw "scripts/run_backend_quality_gate.ps1 failed with exit code $LASTEXITCODE."
+}
+
 $now = Get-Date
 $buildNumber = "{0}{1}{2}{3}{4}" -f $now.ToString("dd"), $now.ToString("MM"), $now.ToString("yy"), $now.ToString("HH"), $now.ToString("mm")
 

scripts/import_user_emails.py

@@ -0,0 +1,153 @@
+from __future__ import annotations
+
+import argparse
+import csv
+import json
+import sqlite3
+from collections import Counter
+from pathlib import Path
+
+
+ROOT = Path(__file__).resolve().parents[1]
+DEFAULT_CSV_PATH = ROOT / "data" / "jellyfin_users_normalized.csv"
+DEFAULT_DB_PATH = ROOT / "data" / "magent.db"
+
+
+def _normalize_email(value: object) -> str | None:
+    if not isinstance(value, str):
+        return None
+    candidate = value.strip()
+    if not candidate or "@" not in candidate:
+        return None
+    return candidate
+
+
+def _load_rows(csv_path: Path) -> list[dict[str, str]]:
+    with csv_path.open("r", encoding="utf-8", newline="") as handle:
+        return [dict(row) for row in csv.DictReader(handle)]
+
+
+def _ensure_email_column(conn: sqlite3.Connection) -> None:
+    try:
+        conn.execute("ALTER TABLE users ADD COLUMN email TEXT")
+    except sqlite3.OperationalError:
+        pass
+    conn.execute(
+        """
+        CREATE INDEX IF NOT EXISTS idx_users_email_nocase
+        ON users (email COLLATE NOCASE)
+        """
+    )
+
+
+def _lookup_user(conn: sqlite3.Connection, username: str) -> list[sqlite3.Row]:
+    return conn.execute(
+        """
+        SELECT id, username, email
+        FROM users
+        WHERE username = ? COLLATE NOCASE
+        ORDER BY
+            CASE WHEN username = ? THEN 0 ELSE 1 END,
+            id ASC
+        """,
+        (username, username),
+    ).fetchall()
+
+
+def import_user_emails(csv_path: Path, db_path: Path) -> dict[str, object]:
+    rows = _load_rows(csv_path)
+    username_counts = Counter(
+        str(row.get("Username") or "").strip().lower()
+        for row in rows
+        if str(row.get("Username") or "").strip()
+    )
+    duplicate_usernames = {
+        username for username, count in username_counts.items() if username and count > 1
+    }
+
+    summary: dict[str, object] = {
+        "csv_path": str(csv_path),
+        "db_path": str(db_path),
+        "source_rows": len(rows),
+        "updated": 0,
+        "unchanged": 0,
+        "missing_email": [],
+        "missing_user": [],
+        "duplicate_source_username": [],
+    }
+
+    with sqlite3.connect(db_path) as conn:
+        conn.row_factory = sqlite3.Row
+        _ensure_email_column(conn)
+
+        for row in rows:
+            username = str(row.get("Username") or "").strip()
+            if not username:
+                continue
+            username_key = username.lower()
+            if username_key in duplicate_usernames:
+                cast_list = summary["duplicate_source_username"]
+                assert isinstance(cast_list, list)
+                if username not in cast_list:
+                    cast_list.append(username)
+                continue
+
+            email = _normalize_email(row.get("Email"))
+            if not email:
+                cast_list = summary["missing_email"]
+                assert isinstance(cast_list, list)
+                cast_list.append(username)
+                continue
+
+            matches = _lookup_user(conn, username)
+            if not matches:
+                cast_list = summary["missing_user"]
+                assert isinstance(cast_list, list)
+                cast_list.append(username)
+                continue
+
+            current_emails = {
+                normalized.lower()
+                for normalized in (_normalize_email(row["email"]) for row in matches)
+                if normalized
+            }
+            if current_emails == {email.lower()}:
+                summary["unchanged"] = int(summary["unchanged"]) + 1
+                continue
+
+            conn.execute(
+                """
+                UPDATE users
+                SET email = ?
+                WHERE username = ? COLLATE NOCASE
+                """,
+                (email, username),
+            )
+            summary["updated"] = int(summary["updated"]) + 1
+
+    summary["missing_email_count"] = len(summary["missing_email"])  # type: ignore[arg-type]
+    summary["missing_user_count"] = len(summary["missing_user"])  # type: ignore[arg-type]
+    summary["duplicate_source_username_count"] = len(summary["duplicate_source_username"])  # type: ignore[arg-type]
+    return summary
+
+
+def main() -> None:
+    parser = argparse.ArgumentParser(description="Import user email addresses into Magent users.")
+    parser.add_argument(
+        "csv_path",
+        nargs="?",
+        default=str(DEFAULT_CSV_PATH),
+        help="CSV file containing Username and Email columns",
+    )
+    parser.add_argument(
+        "--db-path",
+        default=str(DEFAULT_DB_PATH),
+        help="Path to the Magent SQLite database",
+    )
+    args = parser.parse_args()
+    summary = import_user_emails(Path(args.csv_path), Path(args.db_path))
+    print(json.dumps(summary, indent=2, sort_keys=True))
+
+
+if __name__ == "__main__":
+    main()

scripts/process1.ps1

@@ -243,6 +243,10 @@ try {
     $script:CurrentStep = "updating build metadata"
     Update-BuildFiles -BuildNumber $buildNumber
 
+    $script:CurrentStep = "running backend quality gate"
+    powershell -ExecutionPolicy Bypass -File (Join-Path $repoRoot "scripts\run_backend_quality_gate.ps1")
+    Assert-LastExitCode -CommandName "scripts/run_backend_quality_gate.ps1"
+
     $script:CurrentStep = "rebuilding local docker stack"
     docker compose up -d --build
     Assert-LastExitCode -CommandName "docker compose up -d --build"

scripts/run_backend_quality_gate.ps1

@@ -0,0 +1,59 @@
+$ErrorActionPreference = "Stop"
+
+$repoRoot = Resolve-Path "$PSScriptRoot\.."
+Set-Location $repoRoot
+
+function Assert-LastExitCode {
+    param([Parameter(Mandatory = $true)][string]$CommandName)
+
+    if ($LASTEXITCODE -ne 0) {
+        throw "$CommandName failed with exit code $LASTEXITCODE."
+    }
+}
+
+function Get-PythonCommand {
+    $venvPython = Join-Path $repoRoot ".venv\Scripts\python.exe"
+    if (Test-Path $venvPython) {
+        return $venvPython
+    }
+    return "python"
+}
+
+function Ensure-PythonModule {
+    param(
+        [Parameter(Mandatory = $true)][string]$PythonExe,
+        [Parameter(Mandatory = $true)][string]$ModuleName,
+        [Parameter(Mandatory = $true)][string]$PackageName
+    )
+
+    & $PythonExe -c "import importlib.util, sys; sys.exit(0 if importlib.util.find_spec('$ModuleName') else 1)"
+    if ($LASTEXITCODE -eq 0) {
+        return
+    }
+
+    Write-Host "Installing missing Python package: $PackageName"
+    & $PythonExe -m pip install $PackageName
+    Assert-LastExitCode -CommandName "python -m pip install $PackageName"
+}
+
+$pythonExe = Get-PythonCommand
+
+Write-Host "Installing backend Python requirements"
+& $pythonExe -m pip install -r (Join-Path $repoRoot "backend\requirements.txt")
+Assert-LastExitCode -CommandName "python -m pip install -r backend/requirements.txt"
+
+Write-Host "Running Python dependency integrity check"
+& $pythonExe -m pip check
+Assert-LastExitCode -CommandName "python -m pip check"
+
+Ensure-PythonModule -PythonExe $pythonExe -ModuleName "pip_audit" -PackageName "pip-audit"
+
+Write-Host "Running Python vulnerability scan"
+& $pythonExe -m pip_audit -r (Join-Path $repoRoot "backend\requirements.txt") --progress-spinner off --desc
+Assert-LastExitCode -CommandName "python -m pip_audit"
+
+Write-Host "Running backend unit tests"
+& $pythonExe -m unittest discover -s backend/tests -p "test_*.py" -v
+Assert-LastExitCode -CommandName "python -m unittest discover"
+
+Write-Host "Backend quality gate passed"