Merge branch '534-default-admins-setting-broken' into 'master'

Resolve "Default ADMINS setting broken"

Closes #534

See merge request !764

CHANGELOG.rst

@@ -24,6 +24,11 @@ Changed
 * OAuth Grant Flows are now configured system-wide instead of per app.
 * Refactor OAuth2 application management views.
 
+Fixed
+~~~~~
+
+* Fix default admin contacts
+
 Credits
 ~~~~~~~
 

aleksis/core/settings.py

@@ -533,9 +533,11 @@ SASS_PROCESSOR_INCLUDE_DIRS = [
     os.path.join(STATIC_ROOT, "public"),
 ]
 
-ADMINS = _settings.get("contact.admins", [AUTH_INITIAL_SUPERUSER["email"]])
-SERVER_EMAIL = _settings.get("contact.from", ADMINS[0])
-DEFAULT_FROM_EMAIL = _settings.get("contact.from", ADMINS[0])
+ADMINS = _settings.get(
+    "contact.admins", [(AUTH_INITIAL_SUPERUSER["username"], AUTH_INITIAL_SUPERUSER["email"])]
+)
+SERVER_EMAIL = _settings.get("contact.from", ADMINS[0][1])
+DEFAULT_FROM_EMAIL = _settings.get("contact.from", ADMINS[0][1])
 MANAGERS = _settings.get("contact.admins", ADMINS)
 
 if _settings.get("mail.server.host", None):