diff --git a/templates/partials/users_list.tpl b/templates/partials/users_list.tpl
index c53be1d..c16c1b5 100644
--- a/templates/partials/users_list.tpl
+++ b/templates/partials/users_list.tpl
@@ -1,3 +1,7 @@
+<!-- IF !users.length -->
+<br/>
+<div class="alert alert-warning">[[users:no-users-found]]</div>
+<!-- ENDIF !users.length -->
 <!-- BEGIN users -->
 <li class="users-box registered-user" data-uid="{users.uid}">
 	<a href="{config.relative_path}/user/{users.userslug}">
@@ -34,6 +38,13 @@
 			<span class="formatted-number">{users.postcount}</span>
 		</div>
 		<!-- ENDIF route_users:postcount -->
+
+		<!-- IF route_users:flags -->
+		<div title="flag count" class="flag-count">
+			<i class="fa fa-flag"></i>
+			<span class="formatted-number"><a href="{config.relative_path}/posts/flags?byUsername={users.username}">{users.flags}</a></span>
+		</div>
+		<!-- ENDIF route_users:flags -->
 	</div>
 </li>
 <!-- END users -->
\ No newline at end of file
diff --git a/templates/partials/users_list_menu.tpl b/templates/partials/users_list_menu.tpl
index 54c2eaa..5d4721e 100644
--- a/templates/partials/users_list_menu.tpl
+++ b/templates/partials/users_list_menu.tpl
@@ -1,10 +1,11 @@
 <ul class="nav nav-pills">
-	<li><a href='{config.relative_path}/users/online'>[[global:online]]</a></li>
-	<li><a href='{config.relative_path}/users/sort-posts'>[[users:top_posters]]</a></li>
+	<li><a href="{config.relative_path}/users/online">[[global:online]]</a></li>
+	<li><a href="{config.relative_path}/users/sort-posts">[[users:top_posters]]</a></li>
 	<!-- IF !reputation:disabled -->
-	<li><a href='{config.relative_path}/users/sort-reputation'>[[users:most_reputation]]</a></li>
+	<li><a href="{config.relative_path}/users/sort-reputation">[[users:most_reputation]]</a></li>
 	<!-- ENDIF !reputation:disabled -->
 	<!-- IF isAdminOrGlobalMod -->
-	<li><a href='{config.relative_path}/users/banned'>[[user:banned]]</a></li>
+	<li><a href="{config.relative_path}/users/flagged">[[users:most_flags]]</a></li>
+	<li><a href="{config.relative_path}/users/banned">[[user:banned]]</a></li>
 	<!-- ENDIF isAdminOrGlobalMod -->
 </ul>
\ No newline at end of file