From 47b5b286d867ee28fc1ce3513932ce2843892d25 Mon Sep 17 00:00:00 2001
From: Basraah <basraaheve@gmail.com>
Date: Thu, 12 Oct 2017 10:20:40 +1000
Subject: [PATCH] Uniform page titles

---
 .../authentication/templates/authentication/dashboard.html   | 2 +-
 allianceauth/authentication/templates/public/login.html      | 2 +-
 allianceauth/authentication/templates/public/register.html   | 2 +-
 .../templates/registration/registration_form.html            | 2 +-
 allianceauth/corputils/templates/corputils/base.html         | 1 -
 .../fleetactivitytracking/characternotexisting.html          | 1 -
 .../templates/fleetactivitytracking/fatlinkformatter.html    | 2 --
 .../templates/fleetactivitytracking/fatlinkmodify.html       | 1 -
 .../fatlinkpersonalmonthlystatisticsview.html                | 1 -
 .../fleetactivitytracking/fatlinkpersonalstatisticsview.html | 1 -
 .../fleetactivitytracking/fatlinkstatisticscorpview.html     | 1 -
 .../fleetactivitytracking/fatlinkstatisticsview.html         | 1 -
 .../templates/fleetactivitytracking/fatlinkview.html         | 1 -
 allianceauth/fleetup/templates/fleetup/characters.html       | 3 +--
 allianceauth/fleetup/templates/fleetup/doctrine.html         | 3 +--
 allianceauth/fleetup/templates/fleetup/doctrinesview.html    | 3 +--
 allianceauth/fleetup/templates/fleetup/fitting.html          | 3 +--
 allianceauth/fleetup/templates/fleetup/fittingsview.html     | 5 ++---
 allianceauth/fleetup/templates/fleetup/index.html            | 1 -
 .../templates/groupmanagement/groupmembers.html              | 2 --
 .../templates/groupmanagement/groupmembership.html           | 2 --
 .../groupmanagement/templates/groupmanagement/groups.html    | 4 +---
 .../groupmanagement/templates/groupmanagement/index.html     | 2 --
 .../hrapplications/templates/hrapplications/corpchoice.html  | 1 -
 .../hrapplications/templates/hrapplications/create.html      | 1 -
 .../hrapplications/templates/hrapplications/management.html  | 2 --
 .../hrapplications/templates/hrapplications/searchview.html  | 2 --
 .../hrapplications/templates/hrapplications/view.html        | 1 -
 allianceauth/notifications/templates/notifications/list.html | 2 +-
 allianceauth/notifications/templates/notifications/view.html | 1 -
 allianceauth/optimer/templates/optimer/add.html              | 2 --
 allianceauth/optimer/templates/optimer/management.html       | 2 --
 allianceauth/optimer/templates/optimer/update.html           | 4 +---
 .../openfire/templates/services/openfire/broadcast.html      | 2 --
 .../templates/services/teamspeak3/teamspeakjoin.html         | 2 --
 .../services/templates/services/fleetformattertool.html      | 2 --
 .../services/templates/services/service_credentials.html     | 1 -
 .../services/templates/services/service_password.html        | 2 --
 allianceauth/services/templates/services/services.html       | 2 --
 allianceauth/srp/templates/srp/add.html                      | 2 --
 allianceauth/srp/templates/srp/data.html                     | 2 --
 allianceauth/srp/templates/srp/management.html               | 1 -
 allianceauth/srp/templates/srp/request.html                  | 2 --
 allianceauth/srp/templates/srp/update.html                   | 2 --
 allianceauth/templates/allianceauth/help.html                | 4 +---
 45 files changed, 14 insertions(+), 74 deletions(-)

diff --git a/allianceauth/authentication/templates/authentication/dashboard.html b/allianceauth/authentication/templates/authentication/dashboard.html
index c9301f8c..9005bd85 100644
--- a/allianceauth/authentication/templates/authentication/dashboard.html
+++ b/allianceauth/authentication/templates/authentication/dashboard.html
@@ -2,7 +2,7 @@
 {% load staticfiles %}
 {% load i18n %}
 
-{% block title %}{% trans "Dashboard" %}{% endblock %}
+{% block page_title %}{% trans "Dashboard" %}{% endblock %}
 
 {% block content %}
     <h1 class="page-header text-center">{% trans "Dashboard" %}</h1>
diff --git a/allianceauth/authentication/templates/public/login.html b/allianceauth/authentication/templates/public/login.html
index 3d8b3164..e3a408ef 100644
--- a/allianceauth/authentication/templates/public/login.html
+++ b/allianceauth/authentication/templates/public/login.html
@@ -1,6 +1,6 @@
 {% extends 'public/middle_box.html' %}
 {% load static %}
-{% block title %}Login{% endblock %}
+{% block page_title %}Login{% endblock %}
 {% block middle_box_content %}
     <p style="text-align:center">
         <a href="{% url 'auth_sso_login' %}">
diff --git a/allianceauth/authentication/templates/public/register.html b/allianceauth/authentication/templates/public/register.html
index 1c8846e9..4fc689ba 100644
--- a/allianceauth/authentication/templates/public/register.html
+++ b/allianceauth/authentication/templates/public/register.html
@@ -2,7 +2,7 @@
 {% load bootstrap %}
 {% load i18n %}
 {% extends 'public/base.html' %}
-{% block title %}Registration{% endblock %}
+{% block page_title %}Registration{% endblock %}
 {% block extra_include %}
     {% include 'bundles/bootstrap-css.html' %}
     {% include 'bundles/fontawesome.html' %}
diff --git a/allianceauth/authentication/templates/registration/registration_form.html b/allianceauth/authentication/templates/registration/registration_form.html
index a2506669..12dbe6d2 100644
--- a/allianceauth/authentication/templates/registration/registration_form.html
+++ b/allianceauth/authentication/templates/registration/registration_form.html
@@ -2,7 +2,7 @@
 {% load bootstrap %}
 {% load i18n %}
 {% load static %}
-{% block title %}Register{% endblock %}
+{% block page_title %}Register{% endblock %}
 {% block middle_box_content %}
     <form class="form-signin" role="form" action="" method="POST">
         {% csrf_token %}
diff --git a/allianceauth/corputils/templates/corputils/base.html b/allianceauth/corputils/templates/corputils/base.html
index a2f3de93..56a626e1 100644
--- a/allianceauth/corputils/templates/corputils/base.html
+++ b/allianceauth/corputils/templates/corputils/base.html
@@ -1,6 +1,5 @@
 {% extends 'allianceauth/base.html' %}
 {% load i18n %}
-{% block title %}{% trans "Corporation Member Data" %}{% endblock %}
 {% block page_title %}{% trans "Corporation Member Data" %}{% endblock %}
 {% block content %}
     <div class="col-lg-12">
diff --git a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/characternotexisting.html b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/characternotexisting.html
index 3de8baeb..e825de51 100644
--- a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/characternotexisting.html
+++ b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/characternotexisting.html
@@ -1,6 +1,5 @@
 {% extends 'allianceauth/base.html' %}
 {% load i18n %}
-{% block title %}Fleet Participation{% endblock %}
 {% block page_title %}{% trans "Fleet Participation" %}{% endblock %}
 
 {% block content %}
diff --git a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkformatter.html b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkformatter.html
index 88d703eb..e9a0b018 100644
--- a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkformatter.html
+++ b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkformatter.html
@@ -3,8 +3,6 @@
 {% load staticfiles %}
 {% load i18n %}
 
-{% block title %}Alliance Auth - Fatlink Create{% endblock %}
-
 {% block page_title %}{% trans "Create Fatlink" %}{% endblock page_title %}
 
 {% block content %}
diff --git a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkmodify.html b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkmodify.html
index 7bb16bf6..ee9de083 100644
--- a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkmodify.html
+++ b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkmodify.html
@@ -2,7 +2,6 @@
 {% load bootstrap %}
 {% load staticfiles %}
 {% load i18n %}
-{% block title %}Alliance Auth{% endblock %}
 {% block page_title %}{% trans "Fatlink view" %}{% endblock page_title %}
 
 {% block content %}
diff --git a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkpersonalmonthlystatisticsview.html b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkpersonalmonthlystatisticsview.html
index a06ac2ba..e527dc6b 100644
--- a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkpersonalmonthlystatisticsview.html
+++ b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkpersonalmonthlystatisticsview.html
@@ -3,7 +3,6 @@
 {% load staticfiles %}
 {% load i18n %}
 
-{% block title %}Alliance Auth{% endblock %}
 {% block page_title %}{% trans "Personal fatlink statistics" %}{% endblock page_title %}
 
 {% block content %}
diff --git a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkpersonalstatisticsview.html b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkpersonalstatisticsview.html
index 59654b7b..3ccfb4eb 100644
--- a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkpersonalstatisticsview.html
+++ b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkpersonalstatisticsview.html
@@ -3,7 +3,6 @@
 {% load staticfiles %}
 {% load i18n %}
 
-{% block title %}Alliance Auth{% endblock %}
 {% block page_title %}{% trans "Personal fatlink statistics" %}{% endblock page_title %}
 
 {% block content %}
diff --git a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkstatisticscorpview.html b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkstatisticscorpview.html
index ea3113ef..eb2ac8f0 100644
--- a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkstatisticscorpview.html
+++ b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkstatisticscorpview.html
@@ -3,7 +3,6 @@
 {% load staticfiles %}
 {% load i18n %}
 
-{% block title %}Alliance Auth{% endblock %}
 {% block page_title %}{% trans "Fatlink Corp Statistics" %}{% endblock page_title %}
 
 {% block content %}
diff --git a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkstatisticsview.html b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkstatisticsview.html
index 6445b9be..2d282183 100644
--- a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkstatisticsview.html
+++ b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkstatisticsview.html
@@ -3,7 +3,6 @@
 {% load staticfiles %}
 {% load i18n %}
 
-{% block title %}Alliance Auth{% endblock %}
 {% block page_title %}{% trans "Fatlink statistics" %}{% endblock page_title %}
 
 {% block content %}
diff --git a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkview.html b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkview.html
index 52a40d65..47954d65 100644
--- a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkview.html
+++ b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkview.html
@@ -3,7 +3,6 @@
 {% load staticfiles %}
 {% load i18n %}
 
-{% block title %}Alliance Auth{% endblock %}
 {% block page_title %}{% trans "Fatlink view" %}{% endblock page_title %}
 
 {% block content %}
diff --git a/allianceauth/fleetup/templates/fleetup/characters.html b/allianceauth/fleetup/templates/fleetup/characters.html
index 63b4c502..c805a8ea 100644
--- a/allianceauth/fleetup/templates/fleetup/characters.html
+++ b/allianceauth/fleetup/templates/fleetup/characters.html
@@ -3,8 +3,7 @@
 {% load staticfiles %}
 {% load i18n %}
 
-{% block title %}Alliance Auth{% endblock %}
-{% block page_title %}FleetUp{% endblock page_title %}
+{% block page_title %}Characters - FleetUp{% endblock page_title %}
 
 {% block content %}
 <div class="col-lg-12">
diff --git a/allianceauth/fleetup/templates/fleetup/doctrine.html b/allianceauth/fleetup/templates/fleetup/doctrine.html
index 0f3cf34f..a06d0c18 100644
--- a/allianceauth/fleetup/templates/fleetup/doctrine.html
+++ b/allianceauth/fleetup/templates/fleetup/doctrine.html
@@ -3,8 +3,7 @@
 {% load staticfiles %}
 {% load i18n %}
 
-{% block title %}Alliance Auth{% endblock %}
-{% block page_title %}FleetUp - Doctrine{% endblock page_title %}
+{% block page_title %}Doctrine - FleetUp{% endblock page_title %}
 
 {% block content %}
 <div class="col-lg-12">
diff --git a/allianceauth/fleetup/templates/fleetup/doctrinesview.html b/allianceauth/fleetup/templates/fleetup/doctrinesview.html
index d0747bc0..acb2b3c5 100644
--- a/allianceauth/fleetup/templates/fleetup/doctrinesview.html
+++ b/allianceauth/fleetup/templates/fleetup/doctrinesview.html
@@ -3,8 +3,7 @@
 {% load staticfiles %}
 {% load i18n %}
 
-{% block title %}Alliance Auth{% endblock %}
-{% block page_title %}FleetUp{% endblock page_title %}
+{% block page_title %}Doctrines - FleetUp{% endblock page_title %}
 
 {% block content %}
 <div class="col-lg-12">
diff --git a/allianceauth/fleetup/templates/fleetup/fitting.html b/allianceauth/fleetup/templates/fleetup/fitting.html
index f0677757..ecf638c2 100644
--- a/allianceauth/fleetup/templates/fleetup/fitting.html
+++ b/allianceauth/fleetup/templates/fleetup/fitting.html
@@ -3,8 +3,7 @@
 {% load staticfiles %}
 {% load i18n %}
 
-{% block title %}Alliance Auth{% endblock %}
-{% block page_title %}{% trans "FleetUp - Doctrine" %}{% endblock page_title %}
+{% block page_title %}{% trans "Doctrine - FleetUp" %}{% endblock page_title %}
 
 {% block content %}
 <div class="col-lg-12">
diff --git a/allianceauth/fleetup/templates/fleetup/fittingsview.html b/allianceauth/fleetup/templates/fleetup/fittingsview.html
index f40d7d62..37aeb962 100644
--- a/allianceauth/fleetup/templates/fleetup/fittingsview.html
+++ b/allianceauth/fleetup/templates/fleetup/fittingsview.html
@@ -3,8 +3,7 @@
 {% load staticfiles %}
 {% load i18n %}
 
-{% block title %}Alliance Auth{% endblock %}
-{% block page_title %}FleetUp{% endblock page_title %}
+{% block page_title %}Fittings - FleetUp{% endblock page_title %}
 
 {% block content %}
 <div class="col-lg-12">
@@ -48,7 +47,7 @@
         {% endfor %}
         </table>
         {% else %}
-        <h3>{% trans "There seems to be no Doctrines in here at the moment!" %}</h3>
+        <h3>{% trans "There seems to be no Fittings in here at the moment!" %}</h3>
     {% endif %}
 </div>
 </div>
diff --git a/allianceauth/fleetup/templates/fleetup/index.html b/allianceauth/fleetup/templates/fleetup/index.html
index 91e55353..aafad68b 100644
--- a/allianceauth/fleetup/templates/fleetup/index.html
+++ b/allianceauth/fleetup/templates/fleetup/index.html
@@ -3,7 +3,6 @@
 {% load staticfiles %}
 {% load i18n %}
 
-{% block title %}Alliance Auth{% endblock %}
 {% block page_title %}FleetUp{% endblock page_title %}
 
 {% block content %}
diff --git a/allianceauth/groupmanagement/templates/groupmanagement/groupmembers.html b/allianceauth/groupmanagement/templates/groupmanagement/groupmembers.html
index 70958e50..1b8ab8f7 100644
--- a/allianceauth/groupmanagement/templates/groupmanagement/groupmembers.html
+++ b/allianceauth/groupmanagement/templates/groupmanagement/groupmembers.html
@@ -2,8 +2,6 @@
 {% load staticfiles %}
 {% load i18n %}
 
-{% block title %}Alliance Auth{% endblock %}
-
 {% block page_title %}{% trans "Group Members" %}{% endblock page_title %}
 {% block extra_css %}{% endblock extra_css %}
 
diff --git a/allianceauth/groupmanagement/templates/groupmanagement/groupmembership.html b/allianceauth/groupmanagement/templates/groupmanagement/groupmembership.html
index cb53129c..7384c23a 100644
--- a/allianceauth/groupmanagement/templates/groupmanagement/groupmembership.html
+++ b/allianceauth/groupmanagement/templates/groupmanagement/groupmembership.html
@@ -2,8 +2,6 @@
 {% load staticfiles %}
 {% load i18n %}
 
-{% block title %}Alliance Auth{% endblock %}
-
 {% block page_title %}{% trans "Groups Membership" %}{% endblock page_title %}
 {% block extra_css %}{% endblock extra_css %}
 
diff --git a/allianceauth/groupmanagement/templates/groupmanagement/groups.html b/allianceauth/groupmanagement/templates/groupmanagement/groups.html
index dd2ea948..d92921c8 100644
--- a/allianceauth/groupmanagement/templates/groupmanagement/groups.html
+++ b/allianceauth/groupmanagement/templates/groupmanagement/groups.html
@@ -2,9 +2,7 @@
 {% load staticfiles %}
 {% load i18n %}
 
-{% block title %}Alliance Auth{% endblock %}
-
-{% block page_title %}{% trans "Available" %}{% endblock page_title %}
+{% block page_title %}{% trans "Available Groups" %}{% endblock page_title %}
 {% block extra_css %}{% endblock extra_css %}
 url
 {% block content %}
diff --git a/allianceauth/groupmanagement/templates/groupmanagement/index.html b/allianceauth/groupmanagement/templates/groupmanagement/index.html
index a403f42c..c8c09d0c 100644
--- a/allianceauth/groupmanagement/templates/groupmanagement/index.html
+++ b/allianceauth/groupmanagement/templates/groupmanagement/index.html
@@ -2,8 +2,6 @@
 {% load staticfiles %}
 {% load i18n %}
 
-{% block title %}Alliance Auth{% endblock %}
-
 {% block page_title %}{% trans "Groups Management" %}{% endblock page_title %}
 {% block extra_css %}{% endblock extra_css %}
 
diff --git a/allianceauth/hrapplications/templates/hrapplications/corpchoice.html b/allianceauth/hrapplications/templates/hrapplications/corpchoice.html
index d826c304..9bb5275b 100644
--- a/allianceauth/hrapplications/templates/hrapplications/corpchoice.html
+++ b/allianceauth/hrapplications/templates/hrapplications/corpchoice.html
@@ -2,7 +2,6 @@
 {% load staticfiles %}
 {% load i18n %}
 
-{% block title %}Choose a Corp{% endblock %}
 {% block page_title %}{% trans "Choose a Corp" %}{% endblock page_title %}
 {% block content %}
     <div class="col-lg-12">
diff --git a/allianceauth/hrapplications/templates/hrapplications/create.html b/allianceauth/hrapplications/templates/hrapplications/create.html
index b04472f7..e0770545 100644
--- a/allianceauth/hrapplications/templates/hrapplications/create.html
+++ b/allianceauth/hrapplications/templates/hrapplications/create.html
@@ -2,7 +2,6 @@
 {% load staticfiles %}
 {% load i18n %}
 
-{% block title %}Apply To {{ corp.corporation_name }}{% endblock title %}
 {% block page_title %}{% trans "Apply To" %} {{ corp.corporation_name }}{% endblock page_title %}
 {% block content %}
 <div class="col-lg-12">
diff --git a/allianceauth/hrapplications/templates/hrapplications/management.html b/allianceauth/hrapplications/templates/hrapplications/management.html
index e7dc3eed..d16b6daf 100644
--- a/allianceauth/hrapplications/templates/hrapplications/management.html
+++ b/allianceauth/hrapplications/templates/hrapplications/management.html
@@ -3,8 +3,6 @@
 {% load staticfiles %}
 {% load i18n %}
 
-{% block title %}Alliance Auth{% endblock %}
-
 {% block page_title %}{% trans "HR Application Management" %}{% endblock page_title %}
 {% block extra_css %}{% endblock extra_css %}
 
diff --git a/allianceauth/hrapplications/templates/hrapplications/searchview.html b/allianceauth/hrapplications/templates/hrapplications/searchview.html
index d13868ef..c17a296d 100644
--- a/allianceauth/hrapplications/templates/hrapplications/searchview.html
+++ b/allianceauth/hrapplications/templates/hrapplications/searchview.html
@@ -3,8 +3,6 @@
 {% load staticfiles %}
 {% load i18n %}
 
-{% block title %}Alliance Auth{% endblock %}
-
 {% block page_title %}HR Application Management{% endblock page_title %}
 {% block extra_css %}{% endblock extra_css %}
 
diff --git a/allianceauth/hrapplications/templates/hrapplications/view.html b/allianceauth/hrapplications/templates/hrapplications/view.html
index 79ff472b..c0de5e7b 100644
--- a/allianceauth/hrapplications/templates/hrapplications/view.html
+++ b/allianceauth/hrapplications/templates/hrapplications/view.html
@@ -3,7 +3,6 @@
 {% load bootstrap %}
 {% load i18n %}
 
-{% block title %}Alliance Auth - {% trans "View Application" %}{% endblock %}
 {% block page_title %}{% trans "View Application" %}{% endblock page_title %}
 {% block extra_css %}{% endblock extra_css %}
 
diff --git a/allianceauth/notifications/templates/notifications/list.html b/allianceauth/notifications/templates/notifications/list.html
index c3e34eaa..19347362 100644
--- a/allianceauth/notifications/templates/notifications/list.html
+++ b/allianceauth/notifications/templates/notifications/list.html
@@ -2,7 +2,7 @@
 {% load staticfiles %}
 {% load i18n %}
 
-{% block title %}{% trans "Notifications" %}{% endblock %}
+{% block page_title %}{% trans "Notifications" %}{% endblock %}
 
 {% block content %}
     <div class="col-lg-12">
diff --git a/allianceauth/notifications/templates/notifications/view.html b/allianceauth/notifications/templates/notifications/view.html
index 785b1e90..34e88692 100644
--- a/allianceauth/notifications/templates/notifications/view.html
+++ b/allianceauth/notifications/templates/notifications/view.html
@@ -2,7 +2,6 @@
 {% load staticfiles %}
 {% load i18n %}
 
-{% block title %}View Notification{% endblock title %}
 {% block page_title %}{% trans "View Notification" %}{% endblock page_title %}
 
 {% block content %}
diff --git a/allianceauth/optimer/templates/optimer/add.html b/allianceauth/optimer/templates/optimer/add.html
index da33abbd..5b8e834f 100644
--- a/allianceauth/optimer/templates/optimer/add.html
+++ b/allianceauth/optimer/templates/optimer/add.html
@@ -4,8 +4,6 @@
 {% load i18n %}
 {% get_current_language as LANGUAGE_CODE %}
 
-{% block title %}{% trans "Alliance Auth - Fleet Operation Create" %}{% endblock %}
-
 {% block page_title %}{% trans "Create Operation" %}{% endblock page_title %}
 {% block extra_css %}
     {% include 'bundles/jquery-datetimepicker-css.html' %}
diff --git a/allianceauth/optimer/templates/optimer/management.html b/allianceauth/optimer/templates/optimer/management.html
index 3b57da48..db376330 100644
--- a/allianceauth/optimer/templates/optimer/management.html
+++ b/allianceauth/optimer/templates/optimer/management.html
@@ -3,8 +3,6 @@
 {% load i18n %}
 {% get_current_language as LANGUAGE_CODE %}
 
-{% block title %}Alliance Auth{% endblock %}
-
 {% block page_title %}{% trans "Fleet Operation Management" %}{% endblock page_title %}
 {% block extra_css %}{% endblock extra_css %}
 
diff --git a/allianceauth/optimer/templates/optimer/update.html b/allianceauth/optimer/templates/optimer/update.html
index 78a0ad6c..3573270e 100644
--- a/allianceauth/optimer/templates/optimer/update.html
+++ b/allianceauth/optimer/templates/optimer/update.html
@@ -4,9 +4,7 @@
 {% load i18n %}
 {% get_current_language as LANGUAGE_CODE %}
 
-{% block title %}Alliance Auth - Update Fleet Operation {% endblock %}
-
-{% block page_title %}{% trans "Update AAR Link" %}{% endblock page_title %}
+{% block page_title %}{% trans "Update Fleet Operation" %}{% endblock page_title %}
 
 {% block extra_css %}
     {% include 'bundles/jquery-datetimepicker-css.html' %}
diff --git a/allianceauth/services/modules/openfire/templates/services/openfire/broadcast.html b/allianceauth/services/modules/openfire/templates/services/openfire/broadcast.html
index 81ad6a63..81d5d965 100755
--- a/allianceauth/services/modules/openfire/templates/services/openfire/broadcast.html
+++ b/allianceauth/services/modules/openfire/templates/services/openfire/broadcast.html
@@ -3,8 +3,6 @@
 {% load staticfiles %}
 {% load i18n %}
 
-{% block title %}Alliance Auth{% endblock %}
-
 {% block page_title %}{% trans "Jabber Broadcast" %}{% endblock page_title %}
 {% block extra_css %}{% endblock extra_css %}
 
diff --git a/allianceauth/services/modules/teamspeak3/templates/services/teamspeak3/teamspeakjoin.html b/allianceauth/services/modules/teamspeak3/templates/services/teamspeak3/teamspeakjoin.html
index c0530d63..37fe0880 100644
--- a/allianceauth/services/modules/teamspeak3/templates/services/teamspeak3/teamspeakjoin.html
+++ b/allianceauth/services/modules/teamspeak3/templates/services/teamspeak3/teamspeakjoin.html
@@ -3,8 +3,6 @@
 {% load staticfiles %}
 {% load i18n %}
 
-{% block title %}Alliance Auth{% endblock %}
-
 {% block page_title %}{% trans "Verify Teamspeak" %}{% endblock page_title %}
 {% block extra_css %}{% endblock extra_css %}
 
diff --git a/allianceauth/services/templates/services/fleetformattertool.html b/allianceauth/services/templates/services/fleetformattertool.html
index 15d23c15..3c405643 100644
--- a/allianceauth/services/templates/services/fleetformattertool.html
+++ b/allianceauth/services/templates/services/fleetformattertool.html
@@ -3,8 +3,6 @@
 {% load staticfiles %}
 {% load i18n %}
 
-{% block title %}Alliance Auth{% endblock %}
-
 {% block page_title %}{% trans "Fleet Formatter Tool" %}{% endblock page_title %}
 {% block extra_css %}{% endblock extra_css %}
 
diff --git a/allianceauth/services/templates/services/service_credentials.html b/allianceauth/services/templates/services/service_credentials.html
index f9f5953f..3fd2891a 100644
--- a/allianceauth/services/templates/services/service_credentials.html
+++ b/allianceauth/services/templates/services/service_credentials.html
@@ -3,7 +3,6 @@
 {% load i18n %}
 
 {% block page_title %}Credentials{% endblock page_title %}
-{% block title %}{% trans "Credentials" %}{% endblock title%}
 {% block content %}
     <div class="col-lg-12">
         <h1 class="page-header text-center">{% blocktrans %}{{ service }} Credentials{% endblocktrans %}</h1>
diff --git a/allianceauth/services/templates/services/service_password.html b/allianceauth/services/templates/services/service_password.html
index 1ff919d3..544c431d 100644
--- a/allianceauth/services/templates/services/service_password.html
+++ b/allianceauth/services/templates/services/service_password.html
@@ -3,8 +3,6 @@
 {% load staticfiles %}
 {% load i18n %}
 
-{% block title %}Alliance Auth{% endblock %}
-
 {% block page_title %}{% trans "Service Password Change" %}{% endblock page_title %}
 {% block extra_css %}{% endblock extra_css %}
 
diff --git a/allianceauth/services/templates/services/services.html b/allianceauth/services/templates/services/services.html
index a29ba52b..6f4d39f1 100755
--- a/allianceauth/services/templates/services/services.html
+++ b/allianceauth/services/templates/services/services.html
@@ -2,8 +2,6 @@
 {% load staticfiles %}
 {% load i18n %}
 
-{% block title %}Alliance Auth{% endblock %}
-
 {% block page_title %}{% trans "Services Management" %}{% endblock page_title %}
 {% block extra_css %}{% endblock extra_css %}
 
diff --git a/allianceauth/srp/templates/srp/add.html b/allianceauth/srp/templates/srp/add.html
index 898d09d6..53d98b76 100644
--- a/allianceauth/srp/templates/srp/add.html
+++ b/allianceauth/srp/templates/srp/add.html
@@ -3,8 +3,6 @@
 {% load staticfiles %}
 {% load i18n %}
 
-{% block title %}Alliance Auth - SRP Fleet Create{% endblock %}
-
 {% block page_title %}{% trans "SRP Fleet Create" %}{% endblock page_title %}
 {% block extra_css %}
     {% include 'bundles/jquery-datetimepicker-css.html' %}
diff --git a/allianceauth/srp/templates/srp/data.html b/allianceauth/srp/templates/srp/data.html
index 3311806f..3d4bacd5 100644
--- a/allianceauth/srp/templates/srp/data.html
+++ b/allianceauth/srp/templates/srp/data.html
@@ -4,8 +4,6 @@
 {% load i18n %}
 
 {% load humanize %}
-{% block title %}Alliance Auth{% endblock %}
-
 {% block page_title %}Srp Fleet Data{% endblock page_title %}
 {% block extra_css %}
   {% include 'bundles/x-editable.css.html' %}
diff --git a/allianceauth/srp/templates/srp/management.html b/allianceauth/srp/templates/srp/management.html
index c3fd7089..8a402c4b 100644
--- a/allianceauth/srp/templates/srp/management.html
+++ b/allianceauth/srp/templates/srp/management.html
@@ -4,7 +4,6 @@
 {% load i18n %}
 
 {% load humanize %}
-{% block title %}Alliance Auth{% endblock %}
 
 {% block page_title %}{% trans "Srp Management" %}{% endblock page_title %}
 {% block extra_css %}{% endblock extra_css %}
diff --git a/allianceauth/srp/templates/srp/request.html b/allianceauth/srp/templates/srp/request.html
index 49e1382b..b425e11c 100644
--- a/allianceauth/srp/templates/srp/request.html
+++ b/allianceauth/srp/templates/srp/request.html
@@ -3,8 +3,6 @@
 {% load staticfiles %}
 {% load i18n %}
 
-{% block title %}SRP Request{% endblock %}
-
 {% block page_title %}{% trans "SRP Request" %}{% endblock page_title %}
 
 {% block content %}
diff --git a/allianceauth/srp/templates/srp/update.html b/allianceauth/srp/templates/srp/update.html
index 7b0e4347..ac4f4597 100644
--- a/allianceauth/srp/templates/srp/update.html
+++ b/allianceauth/srp/templates/srp/update.html
@@ -3,8 +3,6 @@
 {% load staticfiles %}
 {% load i18n %}
 
-{% block title %}Alliance Auth - Update AAR Link{% endblock %}
-
 {% block page_title %}{% trans "Update AAR Link" %}{% endblock page_title %}
 
 {% block content %}
diff --git a/allianceauth/templates/allianceauth/help.html b/allianceauth/templates/allianceauth/help.html
index 32a07998..3cef399c 100644
--- a/allianceauth/templates/allianceauth/help.html
+++ b/allianceauth/templates/allianceauth/help.html
@@ -1,8 +1,6 @@
 {% extends "allianceauth/base.html" %}
 
-{% block title %}Alliance Auth{% endblock %}
-
-{% block page_title %}Something something here{% endblock page_title %}
+{% block page_title %}Help{% endblock page_title %}
 
 {% block content %}
     <div class="col-lg-12">