diff --git a/templates/login.tpl b/templates/login.tpl
index d9fb98d..499b54c 100644
--- a/templates/login.tpl
+++ b/templates/login.tpl
@@ -6,7 +6,7 @@
 		<div class="well well-lg">
 			<div class="alert alert-danger" id="login-error-notify" <!-- IF error -->style="display:block"<!-- ELSE -->style="display: none;"<!-- ENDIF error -->>
 				<button type="button" class="close" data-dismiss="alert">&times;</button>
-				<strong>[[login:failed_login_attempt]]</strong>
+				[[login:failed_login_attempt]]
 				<p>{error}</p>
 			</div>
 
diff --git a/templates/popular.tpl b/templates/popular.tpl
index 98f4e7d..512697d 100644
--- a/templates/popular.tpl
+++ b/templates/popular.tpl
@@ -12,9 +12,7 @@
 
 	<div class="category">
 		<!-- IF !topics.length -->
-		<div class="alert alert-warning" id="category-no-topics">
-			<strong>[[recent:no_popular_topics]]</strong>
-		</div>
+		<div class="alert alert-warning" id="category-no-topics">[[recent:no_popular_topics]]</div>
 		<!-- ENDIF !topics.length -->
 
 		<!-- IMPORT partials/topics_list.tpl -->
diff --git a/templates/recent.tpl b/templates/recent.tpl
index c27b9b9..9452275 100644
--- a/templates/recent.tpl
+++ b/templates/recent.tpl
@@ -17,9 +17,7 @@
 
 	<div class="category">
 		<!-- IF !topics.length -->
-		<div class="alert alert-warning" id="category-no-topics">
-			<strong>[[recent:no_recent_topics]]</strong>
-		</div>
+		<div class="alert alert-warning" id="category-no-topics">[[recent:no_recent_topics]]</div>
 		<!-- ENDIF !topics.length -->
 
 		<a href="{config.relative_path}/recent">
diff --git a/templates/register.tpl b/templates/register.tpl
index f5bcda0..d77306c 100644
--- a/templates/register.tpl
+++ b/templates/register.tpl
@@ -5,7 +5,7 @@
 		<div class="well well-lg">
 			<div class="alert alert-danger" id="register-error-notify" <!-- IF error -->style="display:block"<!-- ELSE -->style="display: none;"<!-- ENDIF error -->>
 				<button type="button" class="close" data-dismiss="alert">&times;</button>
-				<strong>[[error:registration-error]]</strong>
+				[[error:registration-error]]
 				<p>{error}</p>
 			</div>
 			<form class="form-horizontal" role="form" action="{config.relative_path}/register" method="post">
diff --git a/templates/reset.tpl b/templates/reset.tpl
index 0a6f079..0860680 100644
--- a/templates/reset.tpl
+++ b/templates/reset.tpl
@@ -8,11 +8,11 @@
 <div class="well">
 	<div class="alert alert-success hidden" id="success">
 		<button type="button" class="close" data-dismiss="alert">&times;</button>
-		<strong>[[reset_password:password_reset_sent]]</strong>
+		[[reset_password:password_reset_sent]]
 	</div>
 	<div class="alert alert-danger hidden" id="error">
 		<button type="button" class="close" data-dismiss="alert">&times;</button>
-		<strong>[[reset_password:invalid_email]]</strong>
+		[[reset_password:invalid_email]]
 	</div>
 	<form onsubmit="return false;">
 		<input type="text" class="form-control input-block input-lg" placeholder="[[reset_password:enter_email_address]]" id="email" />
diff --git a/templates/tag.tpl b/templates/tag.tpl
index 49693d0..868e93a 100644
--- a/templates/tag.tpl
+++ b/templates/tag.tpl
@@ -2,9 +2,7 @@
 	<!-- IMPORT partials/breadcrumbs.tpl -->
 
 	<!-- IF !topics.length -->
-	<div class="alert alert-warning">
-		<strong>[[tags:no_tag_topics]]</strong>
-	</div>
+	<div class="alert alert-warning">[[tags:no_tag_topics]]</div>
 	<!-- ENDIF !topics.length -->
 
 	<div class="category">
diff --git a/templates/tags.tpl b/templates/tags.tpl
index e0cde4e..ebb0d52 100644
--- a/templates/tags.tpl
+++ b/templates/tags.tpl
@@ -2,9 +2,7 @@
 	<!-- IMPORT partials/breadcrumbs.tpl -->
 
 	<!-- IF !tags.length -->
-	<div class="alert alert-warning">
-		<strong>[[tags:no_tags]]</strong>
-	</div>
+	<div class="alert alert-warning">[[tags:no_tags]]</div>
 	<!-- ENDIF !tags.length -->
 
 	<input class="form-control" type="text" id="tag-search" placeholder="[[global:search]]"/>
diff --git a/templates/unread.tpl b/templates/unread.tpl
index c045f39..5ac1f99 100644
--- a/templates/unread.tpl
+++ b/templates/unread.tpl
@@ -48,9 +48,7 @@
 	<hr />
 
 	<div class="category">
-		<div id="category-no-topics" class="alert alert-warning <!-- IF topics.length -->hidden<!-- ENDIF topics.length -->">
-			<strong>[[unread:no_unread_topics]]</strong>
-		</div>
+		<div id="category-no-topics" class="alert alert-warning <!-- IF topics.length -->hidden<!-- ENDIF topics.length -->">[[unread:no_unread_topics]]</div>
 
 		<a href="{config.relative_path}/unread">
 			<div class="alert alert-warning hide" id="new-topics-alert"></div>