diff --git a/routers/web/org/setting.go b/routers/web/org/setting.go
index fac83b361285b..3f725689c2065 100644
--- a/routers/web/org/setting.go
+++ b/routers/web/org/setting.go
@@ -75,7 +75,7 @@ func SettingsPost(ctx *context.Context) {
 
 	// Check if organization name has been changed.
 	if nameChanged {
-		err := user_service.RenameUser(ctx, org.AsUser(), form.Name)
+		err := org_service.RenameOrganization(ctx, org, form.Name)
 		switch {
 		case user_model.IsErrUserAlreadyExist(err):
 			ctx.Data["OrgName"] = true
diff --git a/services/org/org.go b/services/org/org.go
index dca7794b47150..7b7fc60fd1e5e 100644
--- a/services/org/org.go
+++ b/services/org/org.go
@@ -74,3 +74,8 @@ func DeleteOrganization(ctx context.Context, org *org_model.Organization, purge
 
 	return nil
 }
+
+// RenameOrganization renames an organization.
+func RenameOrganization(ctx context.Context, org *org_model.Organization, newName string) error {
+	return user_service.RenameUser(ctx, org.AsUser(), newName)
+}