diff --git a/post.php b/post.php
index d160c7e3..92035f77 100644
--- a/post.php
+++ b/post.php
@@ -430,7 +430,7 @@ if (isset($_POST['delete'])) {
 			error('GeoIP not available: ' . geoip_db_filename(GEOIP_COUNTRY_EDITION));
 		}
 		if ($country_code = @geoip_country_code_by_name($_SERVER['REMOTE_ADDR'])) {
-			$post['body'] .= '<tinyboard flag_country>' . strtolower($country_code) . '</tinyboard>';
+			$post['body'] .= '<tinyboard flag>' . strtolower($country_code) . '</tinyboard>';
 		}
 	}
 	
diff --git a/templates/post_reply.html b/templates/post_reply.html
index 1cce0e27..3ae60b0d 100644
--- a/templates/post_reply.html
+++ b/templates/post_reply.html
@@ -28,8 +28,8 @@
 		{% if post.mod and post.mod|hasPermission(config.mod.show_ip, board.uri) %}
 			 [<a style="margin:0;" href="?/IP/{{ post.ip }}">{{ post.ip }}</a>]
 		{% endif %}
-		{% if config.display_flags and post.modifiers.flag_country %}
-			 <img class="flag" style="width:{{ config.flag_width }}px;height:{{ config.flag_height }}px" src="{{ config.uri_flags|sprintf(post.modifiers.flag_country) }}">
+		{% if config.display_flags and post.modifiers.flag %}
+			 <img class="flag" style="width:{{ config.flag_width }}px;height:{{ config.flag_height }}px" src="{{ config.uri_flags|sprintf(post.modifiers.flag) }}">
 		{% endif %}
 		 <time datetime="{{ post.time|date('%Y-%m-%dT%H:%M:%S') }}{{ timezone() }}">{{ post.time|date(config.post_date) }}</time>
 	</label>
diff --git a/templates/post_thread.html b/templates/post_thread.html
index 6824ce9d..f4ca7e72 100644
--- a/templates/post_thread.html
+++ b/templates/post_thread.html
@@ -82,8 +82,8 @@
 		{% if post.mod and post.mod|hasPermission(config.mod.show_ip, board.uri) %}
 			 [<a style="margin:0;" href="?/IP/{{ post.ip }}">{{ post.ip }}</a>]
 		{% endif %}
-		{% if config.display_flags and post.modifiers.flag_country %}
-			 <img class="flag" style="width:{{ config.flag_width }}px;height:{{ config.flag_height }}px" src="{{ config.uri_flags|sprintf(post.modifiers.flag_country) }}">
+		{% if config.display_flags and post.modifiers.flag %}
+			 <img class="flag" style="width:{{ config.flag_width }}px;height:{{ config.flag_height }}px" src="{{ config.uri_flags|sprintf(post.modifiers.flag) }}">
 		{% endif %}
 		 <time datetime="{{ post.time|date('%Y-%m-%dT%H:%M:%S') }}{{ timezone() }}">{{ post.time|date(config.post_date) }}</time>
 	</label>