diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 4e6a951b74d91aa84f47cde9c9111231374c72c2..7ed86fdea494fe395b2f48dd277a001801768060 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -28,6 +28,14 @@ Removed
   * It caused major performance issues and is not useful with the new
     frontend anymore
 
+`2.12.1`_ - 2022-11-06
+----------------------
+
+Fixed
+~~~~~
+
+* An invalid backport caused OIDC clients without PKCD to fail.
+
 `2.12`_ - 2022-11-04
 --------------------
 
@@ -972,4 +980,8 @@ Fixed
 =======
 .. _2.11.1: https://edugit.org/AlekSIS/Official/AlekSIS/-/tags/2.11.1
 .. _2.12: https://edugit.org/AlekSIS/Official/AlekSIS/-/tags/2.12
+<<<<<<< HEAD
 >>>>>>> c48c9201 (Bump version to 2.12)
+=======
+.. _2.12.1: https://edugit.org/AlekSIS/Official/AlekSIS/-/tags/2.12.1
+>>>>>>> 196467bc (Downgrade OAuth toolkit to 1.7.1 and release bugfix)
diff --git a/pyproject.toml b/pyproject.toml
index 828f987b1e31a24f9fac8d833860a598acc57cc6..2c4c646a12cf1c70562637436bc9c89263b62cdb 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -113,7 +113,7 @@ django-allauth = "^0.51.0"
 django-uwsgi-ng = "^1.1.0"
 django-extensions = "^3.1.1"
 ipython = "^8.0.0"
-django-oauth-toolkit = "^2.0.0"
+django-oauth-toolkit = "^1.7.1"
 django-redis = "^5.0.0"
 django-storages = {version = "^1.11.1", optional = true}
 boto3 = {version = "^1.17.33", optional = true}