diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index cecbf7f2b7b41ed8104cfbc70f7ed0c7daf1a4de..dc5a3275ceea0f049f2e61782efcb796e2deff18 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -14,6 +14,11 @@ Changed
 
 * Added a `Retry` button to the server error page
 
+Fixed
+~~~~~
+
+* Serve OAuth discovery information under root of domain
+
 `2.7.4`_ - 2022-02-09
 ---------------------
 
diff --git a/aleksis/core/settings.py b/aleksis/core/settings.py
index 087762de88b667f90c942f3596a7df4991faf627..ce99ff32c66db9ca4576668308de67fe43aa6aa7 100644
--- a/aleksis/core/settings.py
+++ b/aleksis/core/settings.py
@@ -408,6 +408,10 @@ elif _OIDC_RSA_KEY:
     with open(_OIDC_RSA_KEY, "r") as f:
         OAUTH2_PROVIDER["OIDC_RSA_PRIVATE_KEY"] = f.read()
 
+OAUTH2_PROVIDER["OIDC_ISS_ENDPOINT"] = _settings.get(
+    "http.base_url", "http://localhost:8000" if DEBUG else f"https://{ALLOWED_HOSTS[0]}"
+)
+
 # Configuration for REST framework
 REST_FRAMEWORK = {
     "DEFAULT_AUTHENTICATION_CLASSES": [