diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index 148f07dee..f277ff8fc 100755
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -2059,6 +2059,9 @@ people = People
 teams = Teams
 lower_members = members
 lower_repositories = repositories
+lower_member=member
+lower_repository = repository
+
 create_new_team = New Team
 create_team = Create Team
 org_desc = Description
diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini
index b527ef005..197481358 100755
--- a/options/locale/locale_zh-CN.ini
+++ b/options/locale/locale_zh-CN.ini
@@ -2069,6 +2069,8 @@ people=组织成员
 teams=组织团队
 lower_members=名成员
 lower_repositories=个项目
+lower_member=名成员
+lower_repository=个项目
 create_new_team=新建团队
 create_team=创建团队
 org_desc=组织描述
diff --git a/templates/org/home.tmpl b/templates/org/home.tmpl
index e03c28a9e..aa0704434 100755
--- a/templates/org/home.tmpl
+++ b/templates/org/home.tmpl
@@ -67,8 +67,20 @@
 									<div class="item">
 										<a href="{{$.OrgLink}}/teams/{{.LowerName}}"><strong class="team-name">{{.Name}}</strong></a>
 										<p class="text grey">
-											<a href="{{$.OrgLink}}/teams/{{.LowerName}}"><strong>{{.NumMembers}}</strong> {{$.i18n.Tr "org.lower_members"}}</a> ·
-											<a href="{{$.OrgLink}}/teams/{{.LowerName}}/repositories"><strong>{{.NumRepos}}</strong> {{$.i18n.Tr "org.lower_repositories"}}</a>
+											<a href="{{$.OrgLink}}/teams/{{.LowerName}}"><strong>{{.NumMembers}}</strong> 
+												{{if le .NumMembers 1}}
+													{{$.i18n.Tr "org.lower_member"}}
+												{{else}}
+													{{$.i18n.Tr "org.lower_members"}}
+												{{end}}
+											</a> ·
+											<a href="{{$.OrgLink}}/teams/{{.LowerName}}/repositories"><strong>{{.NumRepos}}</strong> 
+												{{if le .NumRepos 1}}
+													{{$.i18n.Tr "org.lower_repository"}}
+												{{else}}
+													{{$.i18n.Tr "org.lower_repository"}}
+												{{end}}
+											</a>
 										</p>
 									</div>
 								{{end}}
diff --git a/templates/org/home_courses.tmpl b/templates/org/home_courses.tmpl
index dd287c87f..c411a014b 100644
--- a/templates/org/home_courses.tmpl
+++ b/templates/org/home_courses.tmpl
@@ -221,8 +221,20 @@
 										<div style="margin-top: 10px;">
 											<a href="{{$.OrgLink}}/teams/{{.LowerName}}"><strong class="team-name">{{.Name}}</strong></a>
 											<p class="text grey">
-												<a href="{{$.OrgLink}}/teams/{{.LowerName}}"><strong>{{.NumMembers}}</strong> {{$.i18n.Tr "org.lower_members"}}</a> ·
-												<a href="{{$.OrgLink}}/teams/{{.LowerName}}/repositories"><strong>{{.NumRepos}}</strong> {{$.i18n.Tr "org.lower_repositories"}}</a>
+												<a href="{{$.OrgLink}}/teams/{{.LowerName}}"><strong>{{.NumMembers}}</strong>
+													{{if le .NumMembers 1}}
+														{{$.i18n.Tr "org.lower_member"}}
+													{{else}}
+														{{$.i18n.Tr "org.lower_members"}}
+													{{end}}
+												</a> ·
+												<a href="{{$.OrgLink}}/teams/{{.LowerName}}/repositories"><strong>{{.NumRepos}}</strong> 
+													{{if le .NumRepos 1}}
+														{{$.i18n.Tr "org.lower_repository"}}
+													{{else}}
+														{{$.i18n.Tr "org.lower_repository"}}
+													{{end}}
+												</a>
 											</p>
 										</div>
 									{{end}}