diff --git a/system/admin/admin.php b/system/admin/admin.php
index 7eb2e45..42e58ef 100644
--- a/system/admin/admin.php
+++ b/system/admin/admin.php
@@ -90,7 +90,7 @@ function add_content($title, $tag, $url, $content, $user, $description = null, $
     $post_media = preg_replace('/\s\s+/', ' ', strip_tags($media));
     $pt = safe_tag($tag);
     $post_tag = strtolower(preg_replace(array('/[^a-zA-Z0-9,. \-\p{L}]/u', '/[ -]+/', '/^-|-$/'), array('', '-', ''), remove_accent($pt)));
-    $post_tagmd = preg_replace(array('/[^a-zA-Z0-9,. \-\p{L}]/u', '/[ -]+/', '/^-|-$/'), array('', ' ', ''), $pt);
+    $post_tagmd = safe_html($tag);
     $post_tag = rtrim($post_tag, ',');
     $post_tagmd = rtrim($post_tagmd, ',');
     $post_url = strtolower(preg_replace(array('/[^a-zA-Z0-9 \-\p{L}]/u', '/[ -]+/', '/^-|-$/'), array('', '-', ''), remove_accent($url)));
@@ -161,7 +161,7 @@ function edit_content($title, $tag, $url, $content, $oldfile, $destination = nul
     $post_media = preg_replace('/\s\s+/', ' ', strip_tags($media));
     $pt = safe_tag($tag);
     $post_tag = strtolower(preg_replace(array('/[^a-zA-Z0-9,. \-\p{L}]/u', '/[ -]+/', '/^-|-$/'), array('', '-', ''), remove_accent($pt)));
-    $post_tagmd = preg_replace(array('/[^a-zA-Z0-9,. \-\p{L}]/u', '/[ -]+/', '/^-|-$/'), array('', ' ', ''), $pt);
+    $post_tagmd = safe_html($tag);
     $post_tag = rtrim($post_tag, ',');
     $post_tagmd = rtrim($post_tagmd, ',');
     $post_url = strtolower(preg_replace(array('/[^a-zA-Z0-9 \-\p{L}]/u', '/[ -]+/', '/^-|-$/'), array('', '-', ''), remove_accent($url)));