diff --git a/templates/org/header.tmpl b/templates/org/header.tmpl
index 01d15a4cd..13d0b0511 100644
--- a/templates/org/header.tmpl
+++ b/templates/org/header.tmpl
@@ -8,21 +8,56 @@
{{.DisplayName}}
{{end}}
-
- {{if .IsOrganizationOwner}}
-
{{template "org/header" .}}
{{template "org/navber_course" .}}
diff --git a/templates/org/team/courseTeams.tmpl b/templates/org/team/courseTeams.tmpl
index 13557888c..d4c5acd62 100644
--- a/templates/org/team/courseTeams.tmpl
+++ b/templates/org/team/courseTeams.tmpl
@@ -6,7 +6,7 @@
{{template "base/head" .}}
- {{template "org/header" .}}
+ {{template "org/header_course" .}}
{{template "org/navber_course" .}}
diff --git a/templates/repo/createCourse.tmpl b/templates/repo/createCourse.tmpl
index 5214c41c3..9247d8ece 100644
--- a/templates/repo/createCourse.tmpl
+++ b/templates/repo/createCourse.tmpl
@@ -65,7 +65,7 @@
-
{{.i18n.Tr "cancel"}}
+
{{.i18n.Tr "cancel"}}