diff --git a/routers/org/members.go b/routers/org/members.go
old mode 100644
new mode 100755
diff --git a/routers/routes/routes.go b/routers/routes/routes.go
index 7e7d0642a..46db6803c 100755
--- a/routers/routes/routes.go
+++ b/routers/routes/routes.go
@@ -615,6 +615,11 @@ func RegisterRoutes(m *macaron.Macaron) {
 	//reqRepoBlockChainWriter := context.RequireRepoWriter(models.UnitTypeBlockChain)
 
 	// ***** START: Organization *****
+	m.Group("/org", func() {
+		m.Group("/:org", func() {
+			m.Get("/members", org.Members)
+		}, context.OrgAssignment())
+	})
 	m.Group("/org", func() {
 		m.Group("", func() {
 			m.Get("/create", org.Create)
@@ -625,7 +630,7 @@ func RegisterRoutes(m *macaron.Macaron) {
 			m.Get("/dashboard", user.Dashboard)
 			m.Get("/^:type(issues|pulls)$", user.Issues)
 			m.Get("/milestones", reqMilestonesDashboardPageEnabled, user.Milestones)
-			m.Get("/members", org.Members)
+			//m.Get("/members", org.Members)
 			m.Post("/members/action/:action", org.MembersAction)
 
 			m.Get("/teams", org.Teams)
diff --git a/templates/org/home.tmpl b/templates/org/home.tmpl
old mode 100644
new mode 100755
diff --git a/templates/org/navber.tmpl b/templates/org/navber.tmpl
index 9ff92845e..7bb2ff69c 100755
--- a/templates/org/navber.tmpl
+++ b/templates/org/navber.tmpl
@@ -3,10 +3,10 @@
 		<a class="{{if $.PageIsOrgHome}}active{{end}} item" href="{{.HomeLink}}">
 			{{svg "octicon-home" 16}}&nbsp;{{$.i18n.Tr "org.home"}}
 		</a>
+		<a class="{{if $.PageIsOrgMembers}}active{{end}} item" href="{{$.OrgLink}}/members">
+			{{svg "octicon-organization" 16}}&nbsp;{{$.i18n.Tr "org.people"}}
+		</a>
 		{{if or ($.IsOrganizationMember) ($.IsOrganizationOwner)}}
-			<a class="{{if $.PageIsOrgMembers}}active{{end}} item" href="{{$.OrgLink}}/members">
-				{{svg "octicon-organization" 16}}&nbsp;{{$.i18n.Tr "org.people"}}
-			</a>
 			<a class="{{if $.PageIsOrgTeams}}active{{end}} item" href="{{$.OrgLink}}/teams">
 				{{svg "octicon-jersey" 16}}&nbsp;{{$.i18n.Tr "org.teams"}}
 			</a>
@@ -23,10 +23,10 @@
 				{{svg "octicon-home" 16}}&nbsp;{{$.i18n.Tr "org.home"}}
 			</a>
 			{{end}}
+			<a class="{{if $.PageIsOrgMembers}}active{{end}} item" href="{{$.OrgLink}}/members">
+				{{svg "octicon-organization" 16}}&nbsp;{{$.i18n.Tr "org.people"}}
+			</a>
 			{{if or ($.IsOrganizationMember) ($.IsOrganizationOwner)}}
-				<a class="{{if $.PageIsOrgMembers}}active{{end}} item" href="{{$.OrgLink}}/members">
-					{{svg "octicon-organization" 16}}&nbsp;{{$.i18n.Tr "org.people"}}
-				</a>
 				<a class="{{if $.PageIsOrgTeams}}active{{end}} item" href="{{$.OrgLink}}/teams">
 					{{svg "octicon-jersey" 16}}&nbsp;{{$.i18n.Tr "org.teams"}}
 				</a>