diff --git a/services/user/user.go b/services/user/user.go
index 9b8bcf83c0..539c848ced 100644
--- a/services/user/user.go
+++ b/services/user/user.go
@@ -4,6 +4,7 @@
 package user
 
 import (
+	group_model "code.gitea.io/gitea/models/group"
 	"context"
 	"fmt"
 	"os"
@@ -78,6 +79,10 @@ func RenameUser(ctx context.Context, u *user_model.User, newUserName string, doe
 		return err
 	}
 
+	if err = group_model.UpdateGroupOwnerName(ctx, oldUserName, newUserName); err != nil {
+		return err
+	}
+
 	if err = user_model.NewUserRedirect(ctx, u.ID, oldUserName, newUserName); err != nil {
 		return err
 	}