diff --git a/changelog.d/6161.bugfix b/changelog.d/6161.bugfix
new file mode 100644
index 0000000000..a0e2adb979
--- /dev/null
+++ b/changelog.d/6161.bugfix
@@ -0,0 +1 @@
+Fix bug where guest account registration can wedge after restart.
diff --git a/changelog.d/6161.misc b/changelog.d/6161.misc
deleted file mode 100644
index 7c5d61cb86..0000000000
--- a/changelog.d/6161.misc
+++ /dev/null
@@ -1 +0,0 @@
-Don't regenerate numeric user ID if registration fails.