diff --git a/templates/org/header.tmpl b/templates/org/header.tmpl
index 0192ad7d8..d00b7c28c 100644
--- a/templates/org/header.tmpl
+++ b/templates/org/header.tmpl
@@ -4,7 +4,7 @@
 			<div class="column">
 				<div class="ui header">
 					<img class="ui image" src="{{.RelAvatarLink}}?s=100">
-					<span class="text thin grey"><a href="{{.HomeLink}}">{{.DisplayName}}</a></span>
+					<span class="text thin grey"><a href="{{.HomeLink}}">{{.DisplayName | Str2html}}</a></span>
 
 					<div class="ui right">
 						<div class="ui menu">
diff --git a/templates/org/home.tmpl b/templates/org/home.tmpl
index 9b8b31166..e62e68455 100644
--- a/templates/org/home.tmpl
+++ b/templates/org/home.tmpl
@@ -6,7 +6,7 @@
 				<img class="ui left" id="org-avatar" src="{{.Org.RelAvatarLink}}?s=140"/>
 				<div id="org-info">
 					<div class="ui header">
-						{{.Org.DisplayName}}
+						{{.Org.DisplayName | Str2html}}
 						{{if .IsOrganizationOwner}}<a class="text grey" href="{{.OrgLink}}/settings"><span class="octicon octicon-gear"></span></a>{{end}}
 					</div>
 					{{if .Org.Description}}<p class="desc">{{.Org.Description}}</p>{{end}}
diff --git a/templates/org/member/invite.tmpl b/templates/org/member/invite.tmpl
index 29e7928f0..c1c2d88f2 100644
--- a/templates/org/member/invite.tmpl
+++ b/templates/org/member/invite.tmpl
@@ -4,7 +4,7 @@
 	<div class="ui container">
 		<div id="invite-box">
 			{{template "base/alert" .}}
-			<h2>{{.i18n.Tr "org.members.invite_desc" .Org.DisplayName}}</h2>
+			<h2>{{.i18n.Tr "org.members.invite_desc" .Org.DisplayName | Str2html}}</h2>
 			<form class="ui form" action="{{.Link}}" method="post">
 				{{.CsrfTokenHtml}}
 				<div class="inline field ui left">
diff --git a/templates/org/settings/options.tmpl b/templates/org/settings/options.tmpl
index 804136543..72c191e54 100644
--- a/templates/org/settings/options.tmpl
+++ b/templates/org/settings/options.tmpl
@@ -18,7 +18,7 @@
 						</div>
 						<div class="field {{if .Err_FullName}}error{{end}}">
 							<label for="full_name">{{.i18n.Tr "org.org_full_name_holder"}}</label>
-							<input id="full_name" name="full_name" value="{{.Org.FullName}}">
+							<input id="full_name" name="full_name" value="{{.Org.FullName | Str2html}}">
 						</div>
 						<div class="field {{if .Err_Description}}error{{end}}">
 							<label for="description">{{$.i18n.Tr "org.org_desc"}}</label>
diff --git a/templates/org/team/members.tmpl b/templates/org/team/members.tmpl
index c9240beb2..091c939e6 100644
--- a/templates/org/team/members.tmpl
+++ b/templates/org/team/members.tmpl
@@ -17,7 +17,7 @@
 							{{end}}
 							<a href="{{.HomeLink}}">
 								<img class="ui avatar image" src="{{.RelAvatarLink}}">
-								{{.DisplayName}}
+								{{.DisplayName | Str2html}}
 							</a>
 						</div>
 					{{end}}