diff --git a/inc/8chan-mod-pages.php b/inc/8chan-mod-pages.php
index 337112aa..9d1479bd 100644
--- a/inc/8chan-mod-pages.php
+++ b/inc/8chan-mod-pages.php
@@ -448,6 +448,7 @@ FLAGS;
 			$poster_ids = isset($_POST['poster_ids']) ? 'true' : 'false';
 			$show_sages = isset($_POST['show_sages']) ? 'true' : 'false';
 			$auto_unicode = isset($_POST['auto_unicode']) ? 'true' : 'false';
+			$strip_combining_chars = isset($_POST['strip_combining_chars']) ? 'true' : 'false';
 			$allow_roll = isset($_POST['allow_roll']) ? 'true' : 'false';
 			$image_reject_repost = isset($_POST['image_reject_repost']) ? 'true' : 'false';
 			$early_404 = isset($_POST['early_404']) ? 'true' : 'false';
@@ -549,6 +550,7 @@ OEKAKI;
 \$config['poster_ids'] = $poster_ids;
 \$config['show_sages'] = $show_sages;
 \$config['auto_unicode'] = $auto_unicode;
+\$config['strip_combining_chars'] = $strip_combining_chars;
 \$config['allow_roll'] = $allow_roll;
 \$config['image_reject_repost'] = $image_reject_repost;
 \$config['early_404'] = $early_404;
diff --git a/settings.php b/settings.php
index f50da306..f6f6b7f8 100644
--- a/settings.php
+++ b/settings.php
@@ -19,6 +19,7 @@ $safe_config['disable_images'] = $config['disable_images'];
 $safe_config['poster_ids'] = $config['poster_ids'];
 $safe_config['show_sages'] = $config['show_sages'];
 $safe_config['auto_unicode'] = $config['auto_unicode'];
+$safe_config['strip_combining_chars'] = $config['strip_combining_chars'];
 $safe_config['allow_roll'] = $config['allow_roll'];
 $safe_config['image_reject_repost'] = $config['image_reject_repost'];
 $safe_config['early_404'] = $config['early_404'];
diff --git a/templates/mod/settings.html b/templates/mod/settings.html
index 9427cd9e..db53a887 100644
--- a/templates/mod/settings.html
+++ b/templates/mod/settings.html
@@ -34,6 +34,7 @@
 		<tr><th>{% trans %}Poster ID's{% endtrans %}</th><td><input type="checkbox" name="poster_ids" {% if config.poster_ids %}checked{% endif %}></td></tr>
 		<tr><th>{% trans %}Display SAGE! after saged posts{% endtrans %}</th><td><input type="checkbox" name="show_sages" {% if config.show_sages %}checked{% endif %}></td></tr>
 		<tr><th>{% trans %}Automatically convert ... to …{% endtrans %}</th><td><input type="checkbox" name="auto_unicode" {% if config.auto_unicode %}checked{% endif %}></td></tr>
+		<tr><th>{% trans %}Disallow combining characters ("Zalgo", Vietnamese text){% endtrans %}</th><td><input type="checkbox" name="strip_combining_chars" {% if config.strip_combining_chars %}checked{% endif %}></td></tr>
 		<tr><th>{% trans %}No index{% endtrans %}<br><span class="unimportant">{% trans %}Hide from boards index<br/>and do not index in search engines{% endtrans %}</span></th><td><input type="checkbox" name="meta_noindex" {% if not board.indexed %}checked{% endif %}></td></tr>
 		<tr><th>{% trans %}Archive my board on 8archive.moe{% endtrans %}<br><span class="unimportant">{% trans %}This archives your board on 8archive.moe if you opt in{% endtrans %}</span></th><td><input type="checkbox" name="8archive" {% if board['8archive'] %}checked{% endif %}></td></tr>
 		<tr><th>{% trans %}[code] tags{% endtrans %}</th><td><input type="checkbox" name="code_tags" {% if 'js/code_tags/run_prettify.js' in config.additional_javascript %}checked{% endif %}></td></tr>