diff --git a/src/themes/OLH/templates/core/accounts/activate_account.html b/src/themes/OLH/templates/core/accounts/activate_account.html
index 0df4d97bd..9cc52ef29 100644
--- a/src/themes/OLH/templates/core/accounts/activate_account.html
+++ b/src/themes/OLH/templates/core/accounts/activate_account.html
@@ -1,8 +1,8 @@
+{% extends "core/base.html" %}
 {% comment %}
   This template is deprecated. Account pages are now part of the back-office.
 {% endcomment %}
 
-{% extends "core/base.html" %}
 {% load foundation %}
 {% load i18n %}
 
diff --git a/src/themes/OLH/templates/core/accounts/edit_profile.html b/src/themes/OLH/templates/core/accounts/edit_profile.html
index d76fa34bc..a068e223d 100644
--- a/src/themes/OLH/templates/core/accounts/edit_profile.html
+++ b/src/themes/OLH/templates/core/accounts/edit_profile.html
@@ -1,8 +1,8 @@
+{% extends "core/base.html" %}
 {% comment %}
   This template is deprecated. Account pages are now part of the back-office.
 {% endcomment %}
 
-{% extends "core/base.html" %}
 {% load i18n %}
 
 {% block title %}{% trans "Edit Profile" %}{% endblock title %}
diff --git a/src/themes/OLH/templates/core/accounts/get_reset_token.html b/src/themes/OLH/templates/core/accounts/get_reset_token.html
index 3d356972a..1036a91ab 100644
--- a/src/themes/OLH/templates/core/accounts/get_reset_token.html
+++ b/src/themes/OLH/templates/core/accounts/get_reset_token.html
@@ -1,8 +1,8 @@
+{% extends "core/base.html" %}
 {% comment %}
   This template is deprecated. Account pages are now part of the back-office.
 {% endcomment %}
 
-{% extends "core/base.html" %}
 {% load i18n foundation %}
 
 
diff --git a/src/themes/OLH/templates/core/accounts/orcid_registration.html b/src/themes/OLH/templates/core/accounts/orcid_registration.html
index 19cf06bd2..c292d9456 100644
--- a/src/themes/OLH/templates/core/accounts/orcid_registration.html
+++ b/src/themes/OLH/templates/core/accounts/orcid_registration.html
@@ -1,8 +1,8 @@
+{% extends "core/base.html" %}
 {% comment %}
   This template is deprecated. Account pages are now part of the back-office.
 {% endcomment %}
 
-{% extends "core/base.html" %}
 {% load foundation %}
 {% load i18n %}
 
diff --git a/src/themes/OLH/templates/core/accounts/public_profile.html b/src/themes/OLH/templates/core/accounts/public_profile.html
index 9acca4fe8..f07c14c08 100644
--- a/src/themes/OLH/templates/core/accounts/public_profile.html
+++ b/src/themes/OLH/templates/core/accounts/public_profile.html
@@ -1,7 +1,3 @@
-{% comment %}
-  This template is deprecated. Account pages are now part of the back-office.
-{% endcomment %}
-
 {% extends "core/base.html" %}
 {% load static %}
 {% load i18n %}
diff --git a/src/themes/OLH/templates/core/accounts/register.html b/src/themes/OLH/templates/core/accounts/register.html
index d5696694f..6506a9647 100644
--- a/src/themes/OLH/templates/core/accounts/register.html
+++ b/src/themes/OLH/templates/core/accounts/register.html
@@ -1,8 +1,8 @@
+{% extends "core/base.html" %}
 {% comment %}
   This template is deprecated. Account pages are now part of the back-office.
 {% endcomment %}
 
-{% extends "core/base.html" %}
 {% load foundation %}
 {% load i18n %}
 
diff --git a/src/themes/OLH/templates/core/accounts/reset_password.html b/src/themes/OLH/templates/core/accounts/reset_password.html
index 9fa4841b4..8806447b7 100644
--- a/src/themes/OLH/templates/core/accounts/reset_password.html
+++ b/src/themes/OLH/templates/core/accounts/reset_password.html
@@ -1,8 +1,8 @@
+{% extends "core/base.html" %}
 {% comment %}
   This template is deprecated. Account pages are now part of the back-office.
 {% endcomment %}
 
-{% extends "core/base.html" %}
 {% load foundation %}
 {% load i18n %}
 
diff --git a/src/themes/clean/templates/core/accounts/activate_account.html b/src/themes/clean/templates/core/accounts/activate_account.html
index ea3930c68..4c823fff6 100644
--- a/src/themes/clean/templates/core/accounts/activate_account.html
+++ b/src/themes/clean/templates/core/accounts/activate_account.html
@@ -1,8 +1,8 @@
+{% extends "core/base.html" %}
 {% comment %}
   This template is deprecated. Account pages are now part of the back-office.
 {% endcomment %}
 
-{% extends "core/base.html" %}
 {% load foundation %}
 {% load i18n %}
 
diff --git a/src/themes/clean/templates/core/accounts/edit_profile.html b/src/themes/clean/templates/core/accounts/edit_profile.html
index 5a39d5791..ee1eabee1 100644
--- a/src/themes/clean/templates/core/accounts/edit_profile.html
+++ b/src/themes/clean/templates/core/accounts/edit_profile.html
@@ -1,8 +1,8 @@
+{% extends "core/base.html" %}
 {% comment %}
   This template is deprecated. Account pages are now part of the back-office.
 {% endcomment %}
 
-{% extends "core/base.html" %}
 {% load i18n %}
 {% load static %}
 
diff --git a/src/themes/clean/templates/core/accounts/get_reset_token.html b/src/themes/clean/templates/core/accounts/get_reset_token.html
index 989b7b844..57f9dbf2f 100644
--- a/src/themes/clean/templates/core/accounts/get_reset_token.html
+++ b/src/themes/clean/templates/core/accounts/get_reset_token.html
@@ -1,8 +1,8 @@
+{% extends "core/base.html" %}
 {% comment %}
   This template is deprecated. Account pages are now part of the back-office.
 {% endcomment %}
 
-{% extends "core/base.html" %}
 {% load i18n bootstrap4 %}
 
 {% block title %}{% trans "Reset Password" %}{% endblock title %}
diff --git a/src/themes/clean/templates/core/accounts/orcid_registration.html b/src/themes/clean/templates/core/accounts/orcid_registration.html
index 5bd2b42e9..575e7053c 100644
--- a/src/themes/clean/templates/core/accounts/orcid_registration.html
+++ b/src/themes/clean/templates/core/accounts/orcid_registration.html
@@ -1,8 +1,8 @@
+{% extends "core/base.html" %}
 {% comment %}
   This template is deprecated. Account pages are now part of the back-office.
 {% endcomment %}
 
-{% extends "core/base.html" %}
 {% load foundation %}
 
 {% block title %}{% trans 'Unregistered ORCiD' %}{% endblock title %}
diff --git a/src/themes/clean/templates/core/accounts/public_profile.html b/src/themes/clean/templates/core/accounts/public_profile.html
index 2eb977cfb..29ee2236d 100644
--- a/src/themes/clean/templates/core/accounts/public_profile.html
+++ b/src/themes/clean/templates/core/accounts/public_profile.html
@@ -1,7 +1,3 @@
-{% comment %}
-  This template is deprecated. Account pages are now part of the back-office.
-{% endcomment %}
-
 {% extends "core/base.html" %}
 {% load static %}
 
diff --git a/src/themes/clean/templates/core/accounts/register.html b/src/themes/clean/templates/core/accounts/register.html
index f0730c40c..383650e9f 100644
--- a/src/themes/clean/templates/core/accounts/register.html
+++ b/src/themes/clean/templates/core/accounts/register.html
@@ -1,8 +1,8 @@
+{% extends "core/base.html" %}
 {% comment %}
   This template is deprecated. Account pages are now part of the back-office.
 {% endcomment %}
 
-{% extends "core/base.html" %}
 {% load bootstrap4 %}
 {% load i18n %}
 
diff --git a/src/themes/clean/templates/core/accounts/reset_password.html b/src/themes/clean/templates/core/accounts/reset_password.html
index a5c3d0891..2ae1610a6 100644
--- a/src/themes/clean/templates/core/accounts/reset_password.html
+++ b/src/themes/clean/templates/core/accounts/reset_password.html
@@ -1,8 +1,8 @@
+{% extends "core/base.html" %}
 {% comment %}
   This template is deprecated. Account pages are now part of the back-office.
 {% endcomment %}
 
-{% extends "core/base.html" %}
 {% load i18n %}
 {% load bootstrap4 %}
 
diff --git a/src/themes/material/templates/core/accounts/activate_account.html b/src/themes/material/templates/core/accounts/activate_account.html
index f653b0231..492f93cae 100644
--- a/src/themes/material/templates/core/accounts/activate_account.html
+++ b/src/themes/material/templates/core/accounts/activate_account.html
@@ -1,8 +1,8 @@
+{% extends "core/base.html" %}
 {% comment %}
   This template is deprecated. Account pages are now part of the back-office.
 {% endcomment %}
 
-{% extends "core/base.html" %}
 {% load foundation %}
 {% load i18n %}
 
diff --git a/src/themes/material/templates/core/accounts/edit_profile.html b/src/themes/material/templates/core/accounts/edit_profile.html
index ddd801724..784e3ce74 100644
--- a/src/themes/material/templates/core/accounts/edit_profile.html
+++ b/src/themes/material/templates/core/accounts/edit_profile.html
@@ -1,8 +1,8 @@
+{% extends "core/base.html" %}
 {% comment %}
   This template is deprecated. Account pages are now part of the back-office.
 {% endcomment %}
 
-{% extends "core/base.html" %}
 {% load i18n %}
 
 {% block title %}{% trans "Edit Profile" %}{% endblock title %}
diff --git a/src/themes/material/templates/core/accounts/get_reset_token.html b/src/themes/material/templates/core/accounts/get_reset_token.html
index 5476ff3f8..45aa6fe58 100644
--- a/src/themes/material/templates/core/accounts/get_reset_token.html
+++ b/src/themes/material/templates/core/accounts/get_reset_token.html
@@ -1,8 +1,8 @@
+{% extends "core/base.html" %}
 {% comment %}
   This template is deprecated. Account pages are now part of the back-office.
 {% endcomment %}
 
-{% extends "core/base.html" %}
 {% load i18n materializecss %}
 
 {% block title %}{% trans "Reset Password" %}{% endblock title %}
diff --git a/src/themes/material/templates/core/accounts/public_profile.html b/src/themes/material/templates/core/accounts/public_profile.html
index 0e7be5553..0d6e2f90d 100644
--- a/src/themes/material/templates/core/accounts/public_profile.html
+++ b/src/themes/material/templates/core/accounts/public_profile.html
@@ -1,7 +1,3 @@
-{% comment %}
-  This template is deprecated. Account pages are now part of the back-office.
-{% endcomment %}
-
 {% extends "core/base.html" %}
 {% load static %}
 {% load i18n %}
diff --git a/src/themes/material/templates/core/accounts/register.html b/src/themes/material/templates/core/accounts/register.html
index 90ebad380..2dcd687ff 100644
--- a/src/themes/material/templates/core/accounts/register.html
+++ b/src/themes/material/templates/core/accounts/register.html
@@ -1,8 +1,8 @@
+{% extends "core/base.html" %}
 {% comment %}
   This template is deprecated. Account pages are now part of the back-office.
 {% endcomment %}
 
-{% extends "core/base.html" %}
 {% load materializecss %}
 {% load i18n %}
 {% load static %}
diff --git a/src/themes/material/templates/core/accounts/reset_password.html b/src/themes/material/templates/core/accounts/reset_password.html
index b39d8c50f..351bff167 100644
--- a/src/themes/material/templates/core/accounts/reset_password.html
+++ b/src/themes/material/templates/core/accounts/reset_password.html
@@ -1,8 +1,8 @@
+{% extends "core/base.html" %}
 {% comment %}
   This template is deprecated. Account pages are now part of the back-office.
 {% endcomment %}
 
-{% extends "core/base.html" %}
 {% load i18n %}
 {% load materializecss %}