diff --git a/src/routes/users.rs b/src/routes/users.rs
index b16ec1733..f05722d2c 100644
--- a/src/routes/users.rs
+++ b/src/routes/users.rs
@@ -182,13 +182,17 @@ pub async fn user_edit(
             let mut transaction = pool.begin().await?;
 
             if let Some(username) = &new_user.username {
-                let user_option =
+                let existing_user_id_option =
                     crate::database::models::User::get_id_from_username_or_id(
                         username, &**pool,
                     )
                     .await?;
 
-                if user_option.is_none() {
+                if existing_user_id_option
+                    .map(UserId::from)
+                    .map(|id| id == user.id)
+                    .unwrap_or(true)
+                {
                     sqlx::query!(
                         "
                     UPDATE users