diff --git a/src/admin/user/commands.rs b/src/admin/user/commands.rs
index 803fbcf26..1cbbf8564 100644
--- a/src/admin/user/commands.rs
+++ b/src/admin/user/commands.rs
@@ -242,7 +242,11 @@ pub(super) async fn deactivate(
 }
 
 #[admin_command]
-pub(super) async fn reset_password(&self, username: String) -> Result<RoomMessageEventContent> {
+pub(super) async fn reset_password(
+	&self,
+	username: String,
+	password: Option<String>,
+) -> Result<RoomMessageEventContent> {
 	let user_id = parse_local_user_id(self.services, &username)?;
 
 	if user_id == self.services.globals.server_user {
@@ -252,7 +256,7 @@ pub(super) async fn reset_password(&self, username: String) -> Result<RoomMessag
 		));
 	}
 
-	let new_password = utils::random_string(AUTO_GEN_PASSWORD_LENGTH);
+	let new_password = password.unwrap_or_else(|| utils::random_string(AUTO_GEN_PASSWORD_LENGTH));
 
 	match self
 		.services
diff --git a/src/admin/user/mod.rs b/src/admin/user/mod.rs
index 60db6de84..1494ea8fa 100644
--- a/src/admin/user/mod.rs
+++ b/src/admin/user/mod.rs
@@ -22,6 +22,8 @@ pub(super) enum UserCommand {
 	ResetPassword {
 		/// Username of the user for whom the password should be reset
 		username: String,
+		/// New password for the user, if unspecified one is generated
+		password: Option<String>,
 	},
 
 	/// - Deactivate a user