diff --git a/web/templates/forum/thread.html b/web/templates/forum/thread.html
index 21cda95..f75372a 100644
--- a/web/templates/forum/thread.html
+++ b/web/templates/forum/thread.html
@@ -1,4 +1,4 @@
-{{define "title"}}{{.Forum.Title}}{{end}}
+{{define "title"}}{{.Thread.Title}} - {{.Forum.Title}}{{end}}
 {{define "content"}}
 <div class="block">
     <section class="hero is-light is-success">
diff --git a/web/templates/photo/permalink.html b/web/templates/photo/permalink.html
index 3c2b3ed..5b1d165 100644
--- a/web/templates/photo/permalink.html
+++ b/web/templates/photo/permalink.html
@@ -1,4 +1,4 @@
-{{define "title"}}Upload a Photo{{end}}
+{{define "title"}}Photo: {{or .Photo.Caption "No caption"}}{{end}}
 {{define "content"}}
 <div class="container">
     <section class="hero is-info is-bold">