diff --git a/templates/org/home.tmpl b/templates/org/home.tmpl
index aa07044349..865a780a85 100755
--- a/templates/org/home.tmpl
+++ b/templates/org/home.tmpl
@@ -78,7 +78,7 @@
 												{{if le .NumRepos 1}}
 													{{$.i18n.Tr "org.lower_repository"}}
 												{{else}}
-													{{$.i18n.Tr "org.lower_repository"}}
+													{{$.i18n.Tr "org.lower_repositories"}}
 												{{end}}
 											</a>
 										</p>
diff --git a/templates/org/home_courses.tmpl b/templates/org/home_courses.tmpl
index c411a014b2..03ca8c41e2 100644
--- a/templates/org/home_courses.tmpl
+++ b/templates/org/home_courses.tmpl
@@ -232,7 +232,7 @@
 													{{if le .NumRepos 1}}
 														{{$.i18n.Tr "org.lower_repository"}}
 													{{else}}
-														{{$.i18n.Tr "org.lower_repository"}}
+														{{$.i18n.Tr "org.lower_repositories"}}
 													{{end}}
 												</a>
 											</p>
diff --git a/templates/org/team/courseTeams.tmpl b/templates/org/team/courseTeams.tmpl
index d4c5acd620..84788f8a5a 100644
--- a/templates/org/team/courseTeams.tmpl
+++ b/templates/org/team/courseTeams.tmpl
@@ -44,7 +44,19 @@
 							{{end}}
 						</div>
 						<div class="ui bottom attached header">
-							<p class="team-meta">{{.NumMembers}} {{$.i18n.Tr "org.lower_members"}} · {{.NumRepos}} {{$.i18n.Tr "org.lower_repositories"}}</p>
+							<p class="team-meta">{{.NumMembers}} 
+								{{if le .NumMembers 1}}
+									{{$.i18n.Tr "org.lower_member"}}
+								{{else}}
+									{{$.i18n.Tr "org.lower_members"}}
+								{{end}}
+								· {{.NumRepos}} 
+								{{if le .NumRepos 1}}
+									{{$.i18n.Tr "org.lower_repository"}}
+								{{else}}
+									{{$.i18n.Tr "org.lower_repositories"}}
+								{{end}}
+							</p>
 						</div>
 					</div>
 			{{end}}
diff --git a/templates/org/team/teams.tmpl b/templates/org/team/teams.tmpl
index e7081b58fa..bc7f5febd9 100644
--- a/templates/org/team/teams.tmpl
+++ b/templates/org/team/teams.tmpl
@@ -36,7 +36,19 @@
 							{{end}}
 						</div>
 						<div class="ui bottom attached header">
-							<p class="team-meta">{{.NumMembers}} {{$.i18n.Tr "org.lower_members"}} · {{.NumRepos}} {{$.i18n.Tr "org.lower_repositories"}}</p>
+							<p class="team-meta">{{.NumMembers}} 
+								{{if le .NumMembers 1}}
+									{{$.i18n.Tr "org.lower_member"}}
+								{{else}}
+									{{$.i18n.Tr "org.lower_members"}}
+								{{end}}
+								· {{.NumRepos}} 
+								{{if le .NumRepos 1}}
+									{{$.i18n.Tr "org.lower_repository"}}
+								{{else}}
+									{{$.i18n.Tr "org.lower_repositories"}}
+								{{end}}
+							</p>
 						</div>
 					</div>
 			{{end}}