diff --git a/files/templates/default.html b/files/templates/default.html
index b59055621..f352d5b84 100644
--- a/files/templates/default.html
+++ b/files/templates/default.html
@@ -6,7 +6,7 @@
{% set csp=CONTENT_SECURITY_POLICY_HOME %}
{% endif %}
- {{html_head.html_head(true, true, true, csp, none, true)}}
+ {{html_head.html_head(true, true, true, csp, SITE_NAME, true)}}
{% block title %}
{% endblock %}
diff --git a/files/templates/html_head.html b/files/templates/html_head.html
index 47a2352ed..8cc2fb82a 100644
--- a/files/templates/html_head.html
+++ b/files/templates/html_head.html
@@ -48,9 +48,13 @@
{% elif '@' in request.path and u %}
{% set author, a_author, published, url, title, image, section =
- '@'+u.username, '@'+u.username, u.created_date,
- u.url, u.username, u.banner_url,
- [u.username, "'s profile - ", SITE_NAME] | join %}
+ '@'+u.username,
+ '@'+u.username,
+ u.created_date,
+ u.url,
+ [u.username, "'s profile - ", SITE_NAME] | join,
+ u.banner_url,
+ [u.username, "'s profile - ", SITE_NAME] | join %}
{% set description %}
"{{u.coins}} coins - Joined {{u.created_date}} -
diff --git a/files/templates/login_2fa.html b/files/templates/login_2fa.html
index 88706a8b2..c7cc05a97 100644
--- a/files/templates/login_2fa.html
+++ b/files/templates/login_2fa.html
@@ -2,7 +2,7 @@
{%- import 'html_head.html' as html_head with context -%}
-{{html_head.html_head(false, false, false, none, none, false)}}
+{{html_head.html_head(false, false, false, none, "Login", false)}}
diff --git a/files/templates/settings2.html b/files/templates/settings2.html
index 090681e4f..926cfcb0f 100644
--- a/files/templates/settings2.html
+++ b/files/templates/settings2.html
@@ -2,7 +2,17 @@
{%- import 'html_head.html' as html_head with context -%}
-{{html_head.html_head(true, false, true, none, none)}}
+{%-
+set PAGE_TITLES = {
+ '/leaderboard': 'Leaderboard',
+ '/admins': 'Admins',
+ '/log': 'Modlog',
+ '/banned': 'Permabanned',
+ '/blocks': 'Blocks',
+}
+-%}
+{%- set title = SITE_NAME if not request.path in PAGE_TITLES else PAGE_TITLES[request.path] -%}
+{{html_head.html_head(true, false, true, none, title)}}
{% include "header.html" %}
diff --git a/files/templates/sign_up_failed_ref.html b/files/templates/sign_up_failed_ref.html
index aec38a19b..a673e87c3 100644
--- a/files/templates/sign_up_failed_ref.html
+++ b/files/templates/sign_up_failed_ref.html
@@ -2,7 +2,7 @@
{%- import 'html_head.html' as html_head with context -%}
-{{html_head.html_head(true, false, false, none, none, false)}}
+{{html_head.html_head(true, false, false, none, "Sign Up: Error", false)}}
diff --git a/files/templates/submit.html b/files/templates/submit.html
index f6ff07698..4c9cccee8 100644
--- a/files/templates/submit.html
+++ b/files/templates/submit.html
@@ -2,7 +2,7 @@
{%- import 'html_head.html' as html_head with context -%}
-{{html_head.html_head(true, false, true, none, "Create a post", false)}}
+{{html_head.html_head(true, false, true, none, "Create a Post", false)}}
{% include "header.html" %}