diff --git a/changelogs/client_server/newsfragments/2336.clarification b/changelogs/client_server/newsfragments/2336.clarification
new file mode 100644
index 00000000..04fad24b
--- /dev/null
+++ b/changelogs/client_server/newsfragments/2336.clarification
@@ -0,0 +1 @@
+Order the common and other error codes alphabetically and remove duplicate `M_THREEPID_IN_USE` definition.
diff --git a/changelogs/identity_service/newsfragments/2336.clarification b/changelogs/identity_service/newsfragments/2336.clarification
new file mode 100644
index 00000000..bba4d38e
--- /dev/null
+++ b/changelogs/identity_service/newsfragments/2336.clarification
@@ -0,0 +1 @@
+Order the standard error codes alphabetically.