diff --git a/routers/web/org/home.go b/routers/web/org/home.go
index 8c9cc8a9d..201eefa61 100644
--- a/routers/web/org/home.go
+++ b/routers/web/org/home.go
@@ -143,7 +143,6 @@ func Home(ctx *context.Context) {
return
}
- ctx.Data["Owner"] = org
ctx.Data["Repos"] = repos
ctx.Data["Total"] = count
ctx.Data["MembersTotal"] = membersCount
diff --git a/routers/web/user/profile.go b/routers/web/user/profile.go
index b39ba58f1..367bb306b 100644
--- a/routers/web/user/profile.go
+++ b/routers/web/user/profile.go
@@ -63,7 +63,7 @@ func Profile(ctx *context.Context) {
ctx.Data["Title"] = ctx.ContextUser.DisplayName()
ctx.Data["PageIsUserProfile"] = true
- ctx.Data["Owner"] = ctx.ContextUser
+ ctx.Data["ContextUser"] = ctx.ContextUser
ctx.Data["OpenIDs"] = openIDs
ctx.Data["IsFollowing"] = isFollowing
diff --git a/routers/web/user/setting/profile.go b/routers/web/user/setting/profile.go
index f500be763..0a8a5e628 100644
--- a/routers/web/user/setting/profile.go
+++ b/routers/web/user/setting/profile.go
@@ -326,7 +326,7 @@ func Repos(ctx *context.Context) {
ctx.Data["Repos"] = repos
}
- ctx.Data["Owner"] = ctxUser
+ ctx.Data["ContextUser"] = ctxUser
pager := context.NewPagination(count, opts.PageSize, opts.Page, 5)
pager.SetDefaultParams(ctx)
ctx.Data["Page"] = pager
diff --git a/templates/base/head.tmpl b/templates/base/head.tmpl
index d179140b2..3932a5859 100644
--- a/templates/base/head.tmpl
+++ b/templates/base/head.tmpl
@@ -30,12 +30,12 @@
{{if .PageIsUserProfile}}
-
+
-
-
- {{if .Owner.Description}}
-
+
+
+ {{if .ContextUser.Description}}
+
{{end}}
{{else if .Repository}}
{{if .Issue}}
diff --git a/templates/org/menu.tmpl b/templates/org/menu.tmpl
index 39189b0c8..1bb19a067 100644
--- a/templates/org/menu.tmpl
+++ b/templates/org/menu.tmpl
@@ -2,8 +2,8 @@