diff --git a/e107_handlers/form_handler.php b/e107_handlers/form_handler.php
index 7f4e7c312..addf30461 100644
--- a/e107_handlers/form_handler.php
+++ b/e107_handlers/form_handler.php
@@ -2797,7 +2797,7 @@ class e_form
 	function name2id($name)
 	{
 		$name = strtolower($name);
-		return rtrim(str_replace(array('[]', '[', ']', '_', '/', ' ','.', '(', ')', '::'), array('-', '-', '', '-', '-', '-', '-','','','-'), $name), '-');
+		return rtrim(str_replace(array('[]', '[', ']', '_', '/', ' ','.', '(', ')', '::', ':'), array('-', '-', '', '-', '-', '-', '-','','','-',''), $name), '-');
 	}
 
 	/**
diff --git a/e107_plugins/linkwords/e_tohtml.php b/e107_plugins/linkwords/e_tohtml.php
index 095d83fd7..bc06b7ee5 100755
--- a/e107_plugins/linkwords/e_tohtml.php
+++ b/e107_plugins/linkwords/e_tohtml.php
@@ -298,7 +298,7 @@ class e_tohtml_linkwords
 
 
 		}
-		
+
 		if (!count($lwClass))
 		{
 	//		return $this->linksproc($sl,$first+1,$limit);		// Nothing to do - move on to next word (shouldn't really get here)
@@ -309,7 +309,7 @@ class e_tohtml_linkwords
 		}
 
 		// This splits the text into blocks, some of which will precisely contain a linkword
-		$split_line = preg_split('#\b('.$lw.')(?:\s|\b)#i'.$this->utfMode, $text, -1, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE );		// *utf (selected)
+		$split_line = preg_split('#\b('.$lw.')(\s|\b)#i'.$this->utfMode, $text, -1, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE );		// *utf (selected)
 	//	$class = "".implode(' ',$lwClass)."' ";
 		$class = implode(' ',$lwClass);