diff --git a/changelog.d/+1608cdcb.feature.md b/changelog.d/+1608cdcb.feature.md
new file mode 100644
index 000000000..36025f242
--- /dev/null
+++ b/changelog.d/+1608cdcb.feature.md
@@ -0,0 +1 @@
+Users will now be prevented from removing their email if the server is configured to require an email when registering an account.
diff --git a/changelog.d/+e82957a7.bugfix.md b/changelog.d/+e82957a7.bugfix.md
new file mode 100644
index 000000000..ce7861bc3
--- /dev/null
+++ b/changelog.d/+e82957a7.bugfix.md
@@ -0,0 +1 @@
+Fixed a situation where multiple email addresses could be associated with one user when that user changes their email address.