diff --git a/DIFFERENCES.md b/DIFFERENCES.md
index fb36a07e..c8568f93 100644
--- a/DIFFERENCES.md
+++ b/DIFFERENCES.md
@@ -50,3 +50,4 @@
 - Fixed spec compliance issue with room version 8 - 11 joins (https://github.com/matrix-org/synapse/issues/16717 / https://github.com/matrix-org/matrix-spec/issues/1708)
 - Add basic cache eviction for true destinations when requests fail if we use a cached destination (e.g. a server has modified their well-known and we're still connecting to the old destination)
 - Only follow 6 redirects total in our default reqwest ClientBuilder
+- Generate passwords with 25 characters instead of 15
diff --git a/src/api/client_server/mod.rs b/src/api/client_server/mod.rs
index 54c99aa0..29a3cb16 100644
--- a/src/api/client_server/mod.rs
+++ b/src/api/client_server/mod.rs
@@ -71,4 +71,4 @@ pub use voip::*;
 pub const DEVICE_ID_LENGTH: usize = 10;
 pub const TOKEN_LENGTH: usize = 32;
 pub const SESSION_ID_LENGTH: usize = 32;
-pub const AUTO_GEN_PASSWORD_LENGTH: usize = 15;
+pub const AUTO_GEN_PASSWORD_LENGTH: usize = 25;
diff --git a/src/service/admin/mod.rs b/src/service/admin/mod.rs
index 01517597..524099d6 100644
--- a/src/service/admin/mod.rs
+++ b/src/service/admin/mod.rs
@@ -622,7 +622,7 @@ impl Service {
 
                     // Inhibit login does not work for guests
                     RoomMessageEventContent::text_plain(format!(
-                        "Created user with user_id: {user_id} and password: {password}"
+                        "Created user with user_id: {user_id} and password: `{password}`"
                     ))
                 }
                 UserCommand::Deactivate {
@@ -699,7 +699,7 @@ impl Service {
                         .set_password(&user_id, Some(new_password.as_str()))
                     {
                         Ok(()) => RoomMessageEventContent::text_plain(format!(
-                            "Successfully reset the password for user {user_id}: {new_password}"
+                            "Successfully reset the password for user {user_id}: `{new_password}`"
                         )),
                         Err(e) => RoomMessageEventContent::text_plain(format!(
                             "Couldn't reset the password for user {user_id}: {e}"