diff --git a/routers/org/setting.go b/routers/org/setting.go
index 30f8cabe3..0b1b512d3 100644
--- a/routers/org/setting.go
+++ b/routers/org/setting.go
@@ -60,6 +60,8 @@ func SettingsPost(ctx *middleware.Context, form auth.UpdateOrgSettingForm) {
 			}
 			return
 		}
+		// reset ctx.org.OrgLink with new name
+		ctx.Org.OrgLink = setting.AppSubUrl + "/org/" + form.Name
 		log.Trace("Organization name changed: %s -> %s", org.Name, form.Name)
 	}
 	// In case it's just a case change.