diff --git a/routers/web/org/home.go b/routers/web/org/home.go
index e0730934761..c559dd3be4d 100644
--- a/routers/web/org/home.go
+++ b/routers/web/org/home.go
@@ -5,10 +5,10 @@ package org
 
 import (
 	"fmt"
+	html_template "html/template"
 	"net/http"
 	"path"
 	"strings"
-	html_template "html/template"
 
 	"code.gitea.io/gitea/models/db"
 	"code.gitea.io/gitea/models/organization"
@@ -131,6 +131,12 @@ func home(ctx *context.Context, viewRepositories bool) {
 		ctx.Data["PageIsViewRepositories"] = true
 	}
 
+	err = shared_user.RenderOrgHeader(ctx)
+	if err != nil {
+		ctx.ServerError("RenderOrgHeader", err)
+		return
+	}
+
 	var (
 		repos []*repo_model.Repository
 		count int64
diff --git a/templates/org/home.tmpl b/templates/org/home.tmpl
index a8e5d4ebd25..e74cbebd896 100644
--- a/templates/org/home.tmpl
+++ b/templates/org/home.tmpl
@@ -5,16 +5,18 @@
 	<div class="ui container">
 		<div class="ui mobile reversed stackable grid">
 			<div class="ui {{if .ShowMemberAndTeamTab}}eleven wide{{end}} column">
+				{{if and .ShowMemberAndTeamTab .HasPublicProfileReadme .HasPrivateProfileReadme}}
 				<div class="item ui small dropdown jump">
-					<span class="text">view as</span>
+					<span class="text">view as: {{if not .IsViewerMember}}Public{{else}}Member{{end}}</span>
 					{{svg "octicon-triangle-down" 14 "dropdown icon"}}
 					<div class="menu">
 						<a href="{{$.Org.HomeLink}}?{{.QueryForPublic}}" class="{{if not .IsViewerMember}}active {{end}}item"><input hidden type="radio" {{if not .IsViewerMember}}checked{{end}}> Public</a>
 						<a href="{{$.Org.HomeLink}}?{{.QueryForMember}}" class="{{if .IsViewerMember}}active {{end}}item"><input hidden type="radio" {{if .IsViewerMember}}checked{{end}}> Member</a>
 					</div>
 				</div>
+				{{end}}
 				{{if .IsViewerMember}}
-					{{if .PrivateProfileReadme}}
+					{{if and .ShowMemberAndTeamTab .PrivateProfileReadme}}
 						<div id="readme_profile" class="markup">{{.PrivateProfileReadme}}</div>
 					{{end}}
 				{{else}}