diff --git a/app/controllers/concerns/authentication.rb b/app/controllers/concerns/authentication.rb
index 08129d9c7..deb8b3fa3 100644
--- a/app/controllers/concerns/authentication.rb
+++ b/app/controllers/concerns/authentication.rb
@@ -38,7 +38,7 @@ module Authentication
 
     def require_account
       unless Current.account.present?
-        redirect_to main_app.session_menu_url(script_name: nil)
+        redirect_to main_app.session_menu_path(script_name: nil)
       end
     end
 
@@ -125,7 +125,7 @@ module Authentication
       serve_development_magic_link(magic_link)
       session[:email_address_pending_authentication] = magic_link.identity.email_address if magic_link
       session[:return_to_after_authenticating] = return_to if return_to
-      redirect_to main_app.session_magic_link_url(script_name: nil)
+      redirect_to main_app.session_magic_link_path(script_name: nil)
     end
 
     def serve_development_magic_link(magic_link)
diff --git a/app/controllers/concerns/authorization.rb b/app/controllers/concerns/authorization.rb
index 46769992e..1afb878ef 100644
--- a/app/controllers/concerns/authorization.rb
+++ b/app/controllers/concerns/authorization.rb
@@ -26,7 +26,7 @@ module Authorization
     end
 
     def ensure_can_access_account
-      redirect_to session_menu_url(script_name: nil) if Current.user.blank? || !Current.user.active?
+      redirect_to session_menu_path(script_name: nil) if Current.user.blank? || !Current.user.active?
     end
 
     def redirect_existing_user
diff --git a/config/environments/development.rb b/config/environments/development.rb
index 4e6285263..e40d4fe16 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -85,9 +85,14 @@ Rails.application.configure do
     config.action_mailer.raise_delivery_errors = false
   end
 
-  config.hosts = %w[ fizzy.localhost localhost 127.0.0.1 ] + [ /^fizzy-\d+(:\d+)$/ ]
+  config.hosts = [
+    "fizzy.localhost",
+    "localhost",
+    "127.0.0.1",
+    /^fizzy-\d+(:\d+)?$/, # review apps: fizzy-123:3000
+    /\.ts\.net$/         # tailscale serve: hostname.tail1234.ts.net
+  ]
 
-  # Set host to be used by links generated in mailer and notification view templates.
-  config.action_controller.default_url_options = { host: config.hosts.first, port: 3006 }
-  config.action_mailer.default_url_options     = { host: config.hosts.first, port: 3006 }
+  # Canonical host for mailer URLs (emails always link here, not personal Tailscale URLs)
+  config.action_mailer.default_url_options = { host: "#{config.hosts.first}:3006" }
 end