diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 7daa9e12b7c40c5dc017d0b57ac1f0669a8d3359..d7198e8b0b2344590ab1990975f824f6f45c6644 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -6,6 +6,15 @@ All notable changes to this project will be documented in this file.
 The format is based on `Keep a Changelog`_,
 and this project adheres to `Semantic Versioning`_.
 
+Unreleased
+----------
+
+Fixed
+~~~~~
+
+* Fix order of submit buttons in login form and restructure login template
+  to make 2FA working correctly.
+
 `2.0rc7`_ - 2021-10-18
 ----------------------