diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx
index 1adecd5..4509fda 100644
--- a/frontend/src/App.tsx
+++ b/frontend/src/App.tsx
@@ -279,6 +279,7 @@ const AppContent: React.FC = () => {
           <Route path="/oauth/callback/:provider" element={<OAuthCallback />} />
           <Route path="/verify-email" element={<VerifyEmail />} />
           <Route path="/accept-invite" element={<AcceptInvitePage />} />
+          <Route path="/accept-invite/:token" element={<AcceptInvitePage />} />
           <Route path="/tenant-onboard" element={<TenantOnboardPage />} />
           <Route path="*" element={<Navigate to="/" replace />} />
         </Routes>
@@ -322,6 +323,7 @@ const AppContent: React.FC = () => {
           <Route path="/oauth/callback/:provider" element={<OAuthCallback />} />
           <Route path="/verify-email" element={<VerifyEmail />} />
           <Route path="/accept-invite" element={<AcceptInvitePage />} />
+          <Route path="/accept-invite/:token" element={<AcceptInvitePage />} />
           <Route path="/tenant-onboard" element={<TenantOnboardPage />} />
           <Route path="*" element={<Navigate to="/" replace />} />
         </Routes>
diff --git a/frontend/src/pages/AcceptInvitePage.tsx b/frontend/src/pages/AcceptInvitePage.tsx
index 36b0b4b..88bb907 100644
--- a/frontend/src/pages/AcceptInvitePage.tsx
+++ b/frontend/src/pages/AcceptInvitePage.tsx
@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from 'react';
-import { useSearchParams, useNavigate } from 'react-router-dom';
+import { useSearchParams, useNavigate, useParams } from 'react-router-dom';
 import { useTranslation } from 'react-i18next';
 import {
   useInvitationDetails,
@@ -23,8 +23,10 @@ import {
 const AcceptInvitePage: React.FC = () => {
   const { t } = useTranslation();
   const [searchParams] = useSearchParams();
+  const { token: pathToken } = useParams<{ token: string }>();
   const navigate = useNavigate();
-  const token = searchParams.get('token');
+  // Support both path parameter (/accept-invite/:token) and query parameter (?token=...)
+  const token = pathToken || searchParams.get('token');
 
   const { data: invitation, isLoading, error } = useInvitationDetails(token);
   const acceptInvitationMutation = useAcceptInvitation();
diff --git a/smoothschedule/config/settings/production.py b/smoothschedule/config/settings/production.py
index a7cc5fb..b1f6a43 100644
--- a/smoothschedule/config/settings/production.py
+++ b/smoothschedule/config/settings/production.py
@@ -168,10 +168,19 @@ if MAILGUN_API_KEY and MAILGUN_DOMAIN:
     }
 else:
     # Fall back to SMTP or console email
-    EMAIL_BACKEND = env(
-        "DJANGO_EMAIL_BACKEND",
-        default="django.core.mail.backends.console.EmailBackend"
-    )
+    EMAIL_HOST = env("EMAIL_HOST", default="")
+    EMAIL_PORT = env.int("EMAIL_PORT", default=587)
+    EMAIL_HOST_USER = env("EMAIL_HOST_USER", default="")
+    EMAIL_HOST_PASSWORD = env("EMAIL_HOST_PASSWORD", default="")
+    EMAIL_USE_TLS = env.bool("EMAIL_USE_TLS", default=True)
+
+    if EMAIL_HOST and EMAIL_HOST_USER and EMAIL_HOST_PASSWORD:
+        EMAIL_BACKEND = "django.core.mail.backends.smtp.EmailBackend"
+    else:
+        EMAIL_BACKEND = env(
+            "DJANGO_EMAIL_BACKEND",
+            default="django.core.mail.backends.console.EmailBackend"
+        )
 
 
 # LOGGING