@@ -86,3 +75,1 @@
-					matrix_id: Some(user_id.to_owned()),
-				});
-			}
+		for user_id in admin_users.iter() {

@@ -22,0 +23,4 @@
+	// that status independently of their presence admin room if not
+	if !self.user_is_admin(user_id).await {
+		let mut admin_list = self.admin_list.write().await;
+		admin_list.insert(user_id.to_owned());

@@ -177,2 +184,4 @@
 	use MembershipState::{Invite, Join, Knock, Leave};
 
+	if self.user_is_admin(user_id).await {
+		let mut admin_list = self.admin_list.write().await;

@@ -115,6 +118,7 @@ impl crate::Service for Service {
 		let mut signals = self.services.server.signal.subscribe();
 		let receiver = self.channel.1.clone();
 
+		self.setup_admins().await;

@@ -352,0 +356,4 @@
+	/// Creates the list of admins for this server. First loads
+	/// the admin_list from the configuration, then adds users from
+	/// the admin room if applicable.
+	pub async fn setup_admins(&self) {

@@ -179,0 +186,4 @@
+		.contains(&user_id.to_owned())
+	{
+		warn!(
+			"Revoking the admin status of {user_id} will not be persistent as they are within \