diff --git a/system/admin/admin.php b/system/admin/admin.php
index 295a22c..d428b38 100644
--- a/system/admin/admin.php
+++ b/system/admin/admin.php
@@ -68,7 +68,7 @@ function edit_post($title, $tag, $url, $content, $oldfile, $destination = null,
 
     $post_title = $title;
     $post_fi = $fi;
-    $post_vid = $vid;
+    $post_vid = str_replace(["http://", "https://", "www.", "youtube", ".com", "/watch?v=", "/embed/"], "", $vid);
     $post_tag = preg_replace(array('/[^a-zA-Z0-9,.\-\p{L}]/u', '/[ -]+/', '/^-|-$/'), array('', '-', ''), remove_accent($tag));
     $post_url = strtolower(preg_replace(array('/[^a-zA-Z0-9 \-\p{L}]/u', '/[ -]+/', '/^-|-$/'), array('', '-', ''), remove_accent($url)));
     if ($description !== null) {
@@ -157,11 +157,11 @@ function edit_page($title, $url, $content, $oldfile, $destination = null, $descr
 // Add blog post
 function add_post($title, $tag, $url, $content, $user, $description = null, $fi, $vid)
 {
-        
+
     $post_date = date('Y-m-d-H-i-s');
     $post_title = $title;
     $post_fi = $fi;
-    $post_vid = $vid;
+    $post_vid = str_replace(["http://", "https://", "www.", "youtube", ".com", "/watch?v=", "/embed/"], "", $vid);
     $post_tag = preg_replace(array('/[^a-zA-Z0-9,.\-\p{L}]/u', '/[ -]+/', '/^-|-$/'), array('', '-', ''), remove_accent($tag));
     $post_url = strtolower(preg_replace(array('/[^a-zA-Z0-9 \-\p{L}]/u', '/[ -]+/', '/^-|-$/'), array('', '-', ''), remove_accent($url)));
     if ($description !== null) {
@@ -170,7 +170,7 @@ function add_post($title, $tag, $url, $content, $user, $description = null, $fi,
         $post_description = "";
     }
     $post_content = '<!--t ' . $post_title . ' t-->' . $post_description . "\n\n" . $content;
-    $post_content = '<!--fi ' . $post_fi . ' fi-->' . "\n\n" .  '<!--vid ' . $post_vid . ' vid-->' . "\n\n" . $post_content;
+    $post_content = '<!--fi ' . $post_fi . ' fi-->' . "\n\n" . '<!--vid ' . $post_vid . ' vid-->' . "\n\n" . $post_content;
 
     if (!empty($post_title) && !empty($post_tag) && !empty($post_url) && !empty($post_content)) {
         if (get_magic_quotes_gpc()) {