diff --git a/modules/installed/apps/templates/apps.html b/modules/installed/apps/templates/apps.html
index 49c750786..a05062282 100644
--- a/modules/installed/apps/templates/apps.html
+++ b/modules/installed/apps/templates/apps.html
@@ -1,4 +1,22 @@
{% extends 'login_nav.html' %}
+{% comment %}
+#
+# This file is part of Plinth.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see .
+#
+{% endcomment %}
{% block main_block %}
diff --git a/modules/installed/apps/templates/photos.html b/modules/installed/apps/templates/photos.html
index d4f6fd280..5658a54ff 100644
--- a/modules/installed/apps/templates/photos.html
+++ b/modules/installed/apps/templates/photos.html
@@ -1,4 +1,22 @@
{% extends 'login_nav.html' %}
+{% comment %}
+#
+# This file is part of Plinth.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see .
+#
+{% endcomment %}
{% block main_block %}
diff --git a/modules/installed/help/templates/about.html b/modules/installed/help/templates/about.html
index 51ca7d9e8..2f4a39b81 100644
--- a/modules/installed/help/templates/about.html
+++ b/modules/installed/help/templates/about.html
@@ -1,4 +1,22 @@
{% extends 'login_nav.html' %}
+{% comment %}
+#
+# This file is part of Plinth.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see .
+#
+{% endcomment %}
{% block main_block %}
diff --git a/modules/installed/help/templates/help.html b/modules/installed/help/templates/help.html
index be405db97..1a259891b 100644
--- a/modules/installed/help/templates/help.html
+++ b/modules/installed/help/templates/help.html
@@ -1,4 +1,22 @@
{% extends 'login_nav.html' %}
+{% comment %}
+#
+# This file is part of Plinth.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see .
+#
+{% endcomment %}
{% block main_block %}
diff --git a/modules/installed/privacy/templates/privacy_config.html b/modules/installed/privacy/templates/privacy_config.html
index 9a81851c9..cc3becb15 100644
--- a/modules/installed/privacy/templates/privacy_config.html
+++ b/modules/installed/privacy/templates/privacy_config.html
@@ -1,4 +1,22 @@
{% extends "login_nav.html" %}
+{% comment %}
+#
+# This file is part of Plinth.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see .
+#
+{% endcomment %}
{% block main_block %}
diff --git a/modules/installed/privacy/templates/tor.html b/modules/installed/privacy/templates/tor.html
index 74e129a69..85ebe5745 100644
--- a/modules/installed/privacy/templates/tor.html
+++ b/modules/installed/privacy/templates/tor.html
@@ -1,4 +1,22 @@
{% extends "login_nav.html" %}
+{% comment %}
+#
+# This file is part of Plinth.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see .
+#
+{% endcomment %}
{% block main_block %}
diff --git a/modules/installed/router/templates/pagekite_introduction.html b/modules/installed/router/templates/pagekite_introduction.html
index bb0fcf3e6..f6619c9a1 100644
--- a/modules/installed/router/templates/pagekite_introduction.html
+++ b/modules/installed/router/templates/pagekite_introduction.html
@@ -1,4 +1,22 @@
{% extends "login_nav.html" %}
+{% comment %}
+#
+# This file is part of Plinth.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see .
+#
+{% endcomment %}
{% block main_block %}
PageKite is a system for exposing {{ cfg.box_name }} services when
diff --git a/modules/installed/services/templates/openid.html b/modules/installed/services/templates/openid.html
index 14268cada..69d6ab8a6 100644
--- a/modules/installed/services/templates/openid.html
+++ b/modules/installed/services/templates/openid.html
@@ -1,4 +1,22 @@
{% extends "login_nav.html" %}
+{% comment %}
+#
+# This file is part of Plinth.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see .
+#
+{% endcomment %}
{% block main_block %}
diff --git a/modules/installed/sharing/templates/file_explorer.html b/modules/installed/sharing/templates/file_explorer.html
index 53c24fbdb..a7f98b232 100644
--- a/modules/installed/sharing/templates/file_explorer.html
+++ b/modules/installed/sharing/templates/file_explorer.html
@@ -1,4 +1,22 @@
{% extends 'login_nav.html' %}
+{% comment %}
+#
+# This file is part of Plinth.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see .
+#
+{% endcomment %}
{% block main_block %}
diff --git a/modules/installed/sharing/templates/sharing.html b/modules/installed/sharing/templates/sharing.html
index 92b01cfd7..020c3edfe 100644
--- a/modules/installed/sharing/templates/sharing.html
+++ b/modules/installed/sharing/templates/sharing.html
@@ -1,4 +1,22 @@
{% extends "login_nav.html" %}
+{% comment %}
+#
+# This file is part of Plinth.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see .
+#
+{% endcomment %}
{% block sidebar_right_block %}
diff --git a/modules/installed/sharing/templates/sharing_printer.html b/modules/installed/sharing/templates/sharing_printer.html
index 3c6c4bd6d..05ef7fb3e 100644
--- a/modules/installed/sharing/templates/sharing_printer.html
+++ b/modules/installed/sharing/templates/sharing_printer.html
@@ -1,4 +1,22 @@
{% extends "login_nav.html" %}
+{% comment %}
+#
+# This file is part of Plinth.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see .
+#
+{% endcomment %}
{% block main_block %}
diff --git a/modules/installed/system/templates/diagnostics.html b/modules/installed/system/templates/diagnostics.html
index f8acb5bcb..afb597e34 100644
--- a/modules/installed/system/templates/diagnostics.html
+++ b/modules/installed/system/templates/diagnostics.html
@@ -1,4 +1,22 @@
{% extends 'login_nav.html' %}
+{% comment %}
+#
+# This file is part of Plinth.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see .
+#
+{% endcomment %}
{% block main_block %}
diff --git a/modules/installed/system/templates/diagnostics_test.html b/modules/installed/system/templates/diagnostics_test.html
index adca2bb8d..93012ab24 100644
--- a/modules/installed/system/templates/diagnostics_test.html
+++ b/modules/installed/system/templates/diagnostics_test.html
@@ -1,4 +1,22 @@
{% extends 'login_nav.html' %}
+{% comment %}
+#
+# This file is part of Plinth.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see .
+#
+{% endcomment %}
{% block main_block %}
diff --git a/modules/installed/system/templates/firewall.html b/modules/installed/system/templates/firewall.html
index 8cd5aff67..5ef2fa972 100644
--- a/modules/installed/system/templates/firewall.html
+++ b/modules/installed/system/templates/firewall.html
@@ -1,4 +1,22 @@
{% extends "login_nav.html" %}
+{% comment %}
+#
+# This file is part of Plinth.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see .
+#
+{% endcomment %}
{% block main_block %}
diff --git a/modules/installed/system/templates/system.html b/modules/installed/system/templates/system.html
index d248627e4..45d842319 100644
--- a/modules/installed/system/templates/system.html
+++ b/modules/installed/system/templates/system.html
@@ -1,4 +1,22 @@
{% extends 'login_nav.html' %}
+{% comment %}
+#
+# This file is part of Plinth.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see .
+#
+{% endcomment %}
{% block main_block %}
diff --git a/modules/installed/system/templates/users_add_sidebar.html b/modules/installed/system/templates/users_add_sidebar.html
index 6b74a39a4..9e079d4c7 100644
--- a/modules/installed/system/templates/users_add_sidebar.html
+++ b/modules/installed/system/templates/users_add_sidebar.html
@@ -1,3 +1,22 @@
+{% comment %}
+#
+# This file is part of Plinth.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see .
+#
+{% endcomment %}
+
Add User
Adding a user via this administrative
diff --git a/modules/installed/system/templates/users_edit_sidebar.html b/modules/installed/system/templates/users_edit_sidebar.html
index c8a0232ed..de49fb13d 100644
--- a/modules/installed/system/templates/users_edit_sidebar.html
+++ b/modules/installed/system/templates/users_edit_sidebar.html
@@ -1,3 +1,22 @@
+{% comment %}
+#
+# This file is part of Plinth.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see .
+#
+{% endcomment %}
+
Edit Users
Click on a user's name to go to a screen for editing that user's