diff --git a/changelog.d/+8777c56c.bugfix.md b/changelog.d/+8777c56c.bugfix.md
new file mode 100644
index 000000000..2f26c65a1
--- /dev/null
+++ b/changelog.d/+8777c56c.bugfix.md
@@ -0,0 +1 @@
+Fixed an issue with a migration that could cause user accounts imported from an identity provider to be marked as deactivated when the server started. If you have accounts affected by this issue, use `!admin users reset-password --convert-to-local-account` to reactivate them.
diff --git a/src/service/migrations.rs b/src/service/migrations.rs
index b718b3f04..6151432b5 100644
--- a/src/service/migrations.rs
+++ b/src/service/migrations.rs
@@ -882,7 +882,7 @@ async fn split_userid_password(services: &Services) -> Result {
 	drop(cork);
 	info!(?remote_users, "Split userid_password.");
 
-	db["global"].insert(FIXED_LOCAL_INVITE_STATE_MARKER, []);
+	db["global"].insert(SPLIT_USERID_PASSWORD, []);
 	db.db.sort()?;
 	Ok(())
 }
@@ -895,5 +895,7 @@ async fn obliterate_roomsynctoken_shortstatehash_with_extreme_prejudice(
 
 	info!("Cleared roomsynctoken_shortstatehash.");
 
+	services.db["global"].insert(DROP_ROOMSYNCTOKEN_SHORTSTATEHASH, []);
+
 	Ok(())
 }