From ddb9097531e8fc7cb8d1cc3a3a36d36df180d266 Mon Sep 17 00:00:00 2001
From: Dominik George <dominik.george@teckids.org>
Date: Fri, 5 Nov 2021 20:10:26 +0100
Subject: [PATCH] Fix default admin contact

---
 CHANGELOG.rst            | 5 +++++
 aleksis/core/settings.py | 4 +++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index a70083c77..3c285046a 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -23,6 +23,11 @@ Changed
 * OAuth Grant Flows are now configured system-wide instead of per app.
 * Refactor OAuth2 application management views.
 
+Fixed
+~~~~~
+
+* Fix default admin contacts
+
 `2.0`_ - 2021-10-29
 -------------------
 
diff --git a/aleksis/core/settings.py b/aleksis/core/settings.py
index 9a0a8b5f2..5d01131d2 100644
--- a/aleksis/core/settings.py
+++ b/aleksis/core/settings.py
@@ -533,7 +533,9 @@ SASS_PROCESSOR_INCLUDE_DIRS = [
     os.path.join(STATIC_ROOT, "public"),
 ]
 
-ADMINS = _settings.get("contact.admins", [AUTH_INITIAL_SUPERUSER["email"]])
+ADMINS = _settings.get(
+    "contact.admins", [(AUTH_INITIAL_SUPERUSER["username"], AUTH_INITIAL_SUPERUSER["email"])]
+)
 SERVER_EMAIL = _settings.get("contact.from", ADMINS[0])
 DEFAULT_FROM_EMAIL = _settings.get("contact.from", ADMINS[0])
 MANAGERS = _settings.get("contact.admins", ADMINS)
-- 
GitLab