diff --git a/templates/post_form.html b/templates/post_form.html
index 9f99157f..421ecfe8 100644
--- a/templates/post_form.html
+++ b/templates/post_form.html
@@ -15,7 +15,7 @@
 				{{ antibot.html() }}
 			</th>
 			<td>
-				<input type="text" name="name" size="25" maxlength="35" autocomplete="off"> {% if config.allow_no_country and config.country_flags %}<input id="no_country" name="no_country" type="checkbox"> <label for="no_country">{% trans %}Don't show my flag{% endtrans %}</label>{% endif %}
+				<input type="text" name="name" size="25" maxlength="35" autocomplete="off">
 				{{ antibot.html() }}
 			</td>
 		</tr>{% endif %}
@@ -144,12 +144,18 @@
 			</td>
 		</tr>
 		{% endif %}
-		{% if mod and ((not id and post.mod|hasPermission(config.mod.sticky, board.uri)) or (not id and post.mod|hasPermission(config.mod.lock, board.uri)) or post.mod|hasPermission(config.mod.rawhtml, board.uri)) %}
+		{% if (mod and ((not id and post.mod|hasPermission(config.mod.sticky, board.uri)) or (not id and post.mod|hasPermission(config.mod.lock, board.uri)) or post.mod|hasPermission(config.mod.rawhtml, board.uri))) or (config.allow_no_country and config.country_flags) %}
 		<tr>
 			<th>
 				{% trans %}Flags{% endtrans %}
 			</th>
 			<td>
+				{% if config.allow_no_country and config.country_flags %}<div class="center">
+					<label for="no_country">{% trans %}No country flag{% endtrans %}</label>
+					<input title="No country flag" id="no_country" name="no_country" type="checkbox">
+				</div>{% endif %}
+
+				{% if mod %}
 				{% if not id and post.mod|hasPermission(config.mod.sticky, board.uri) %}<div class="center">
 					<label for="sticky">{% trans %}Sticky{% endtrans %}</label>
 					<input title="{% trans %}Sticky{% endtrans %}" type="checkbox" name="sticky" id="sticky"><br>
@@ -162,6 +168,7 @@
 					<label for="raw">{% trans %}Raw HTML{% endtrans %}</label><br>
 					<input title="{% trans %}Raw HTML{% endtrans %}" type="checkbox" name="raw" id="raw">
 				</div>{% endif %}
+				{% endif %}
 			</td>
 		</tr>
 		{% endif %}